wip

Author: r0qs

libsolidity/codegen/ArrayUtils.cpp

@@ -289,10 +289,15 @@ void ArrayUtils::copyArrayToStorage(ArrayType const& _targetType, ArrayType cons
 			// stack: target_ref target_data_end source_data_pos target_data_pos_updated source_data_end
 			_context << Instruction::POP << Instruction::SWAP1 << Instruction::POP;
 			// stack: target_ref target_data_end target_data_pos_updated
-			if (targetBaseType->storageBytes() < 32)
-				utils.clearStorageLoop(TypeProvider::uint256(), /* _canOverflow */ false);
+			if (_targetType.isDynamicallySized())
+				ArrayUtils(_context).clearDynamicArray(_targetType);
 			else
-				utils.clearStorageLoop(targetBaseType, /* _canOverflow */ false);
+			{
+				if (targetBaseType->storageBytes() < 32)
+					utils.clearStorageLoop(TypeProvider::uint256(), /* _canOverflow */ true);
+				else
+					utils.clearStorageLoop(targetBaseType, /* _canOverflow */ true);
+			}
 			_context << Instruction::POP;
 		}
 	);
@@ -590,7 +595,6 @@ void ArrayUtils::clearArray(ArrayType const& _typeIn) const
 				ArrayUtils(_context).convertLengthToSize(_type);
 				_context << Instruction::ADD << Instruction::SWAP1;
 				if (_type.baseType()->storageBytes() < 32)
-					// wraps around cleaning for static arrays
 					ArrayUtils(_context).clearStorageLoop(TypeProvider::uint256(), !_type.isDynamicallySized());
 				else
 					ArrayUtils(_context).clearStorageLoop(_type.baseType(), !_type.isDynamicallySized());

libsolidity/codegen/YulUtilFunctions.cpp

@@ -1431,7 +1431,7 @@ std::string YulUtilFunctions::cleanUpStorageArrayEndFunction(ArrayType const& _t
 		)")
 		("convertToSize", arrayConvertLengthToSize(_type))
 		("dataPosition", arrayDataAreaFunction(_type))
-		("clearStorageRange", clearStorageRangeFunction(*_type.baseType(), /* _canOverflow */ false))
+		("clearStorageRange", clearStorageRangeFunction(*_type.baseType(), !_type.isDynamicallySized()))
 		("packed", _type.baseType()->storageBytes() <= 16)
 		("itemsPerSlot", std::to_string(32 / _type.baseType()->storageBytes()))
 		("storageBytes", std::to_string(_type.baseType()->storageBytes()))

test/libsolidity/semanticTests/array/push/array_push_struct.sol

@@ -22,4 +22,4 @@ contract c {
 // test() -> 2, 3, 4, 5
 // gas irOptimized: 135329
 // gas legacy: 147437
-// gas legacyOptimized: 146429
+// gas legacyOptimized: 148715

test/libsolidity/semanticTests/types/mapping/copy_from_mapping_to_mapping.sol

@@ -31,4 +31,4 @@ contract C {
 // f() -> 0x20, 7, 8, 9, 0xa0, 13, 2, 0x40, 0xa0, 2, 3, 4, 2, 3, 4
 // gas irOptimized: 197102
 // gas legacy: 199887
-// gas legacyOptimized: 196845
+// gas legacyOptimized: 203694