wip

Author: r0qs

libsolidity/codegen/ArrayUtils.cpp

@@ -641,9 +641,9 @@ void ArrayUtils::clearArray(ArrayType const& _typeIn) const
 				ArrayUtils(_context).convertLengthToSize(_type);
 				_context << Instruction::ADD << Instruction::SWAP1;
 				if (_type.baseType()->storageBytes() < 32)
-					ArrayUtils(_context).clearStorageLoop(TypeProvider::uint256(), !_type.isDynamicallySized());
+					ArrayUtils(_context).clearStorageLoop(TypeProvider::uint256(), /* _canOverflow */ true);
 				else
-					ArrayUtils(_context).clearStorageLoop(_type.baseType(), !_type.isDynamicallySized());
+					ArrayUtils(_context).clearStorageLoop(_type.baseType(), /* _canOverflow */ true);
 				_context << Instruction::POP;
 			}
 			solAssert(_context.stackHeight() == stackHeightStart - 2, "");
@@ -826,7 +826,7 @@ void ArrayUtils::clearStorageLoop(Type const* _type, bool _canOverflow) const
 {
 	solAssert(_type->storageBytes() >= 32, "");
 	m_context.callLowLevelFunction(
-		"$clearStorageLoop_" + _type->identifier() + (_canOverflow ? "_canOverflow" : "cannotOverflow"),
+		"$clearStorageLoop_" + _type->identifier() + (_canOverflow ? "_canOverflow" : "_cannotOverflow"),
 		2,
 		1,
 		[_type, _canOverflow](CompilerContext& _context)

libsolidity/codegen/YulUtilFunctions.cpp

@@ -1822,7 +1822,7 @@ std::string YulUtilFunctions::clearStorageRangeFunction(Type const& _type, bool
 	if (_type.storageBytes() < 32)
 		solAssert(_type.isValueType(), "");
 
-	std::string functionName = "clear_storage_range_" + _type.identifier();
+	std::string functionName = "clear_storage_range_" + _type.identifier() + (_canOverflow ? "_canOverflow" : "_cannotOverflow");
 
 	return m_functionCollector.createFunction(functionName, [&]() {
 		return Whiskers(R"(

test/libsolidity/semanticTests/array/arrays_complex_from_and_to_storage.sol

@@ -14,7 +14,7 @@ contract Test {
 // set(uint24[3][]): 0x20, 0x06, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12 -> 0x06
 // gas irOptimized: 185216
 // gas legacy: 211036
-// gas legacyOptimized: 206077
+// gas legacyOptimized: 205741
 // data(uint256,uint256): 0x02, 0x02 -> 0x09
 // data(uint256,uint256): 0x05, 0x01 -> 0x11
 // data(uint256,uint256): 0x06, 0x00 -> FAILURE