Adapt ArrayUtils to deal with wrap-around static arrays

clonker · r0qs · commit 07e67a81249e · 2025-05-06T17:39:19.000+02:00
Also sometimes cleanup can be skipped when copying from a smaller source array into a larger target array
diff --git a/libsolidity/codegen/ArrayUtils.cpp b/libsolidity/codegen/ArrayUtils.cpp
@@ -290,7 +290,58 @@ void ArrayUtils::copyArrayToStorage(ArrayType const& _targetType, ArrayType cons
 			_context << Instruction::POP << Instruction::SWAP1 << Instruction::POP;
 			// stack: target_ref target_data_end target_data_pos_updated
 			if (targetBaseType->storageBytes() < 32)
+			{
+				if (!targetType->isDynamicallySized() && !sourceType->isDynamicallySized())
+					if (auto const* targetArrayType = dynamic_cast<ArrayType const*>(targetType))
+					{
+						auto const* sourceArrayType = dynamic_cast<ArrayType const*>(sourceType);
+						solAssert(sourceArrayType);
+
+						// length of source and target arrays, respectively
+						auto const& sourceLength = sourceArrayType->length();
+						auto const& targetLength = targetArrayType->length();
+
+						// number of source and target elements per slot, respectively
+						auto const nSourcePerSlot = 32 / sourceArrayType->baseType()->storageBytes();
+						auto const nTargetPerSlot = 32 / targetArrayType->baseType()->storageBytes();
+
+						// number of source elements that are partially embedded in the final source slot
+						auto const sourceRemainder = sourceLength % nSourcePerSlot;
+
+						// number of source elements in the final slot that are not used by the source array
+						auto const nSourceCarryOver = (nSourcePerSlot - sourceRemainder) % nSourcePerSlot;
+
+						// number of source elements over how many elements we can put into one target slot
+						// This will floor, e.g.:
+						// source length = 8, nTargetPerSlot = 3 -> targetCopyEndSlotWithoutRemainder = 8 // 3 = 2
+						// source length = 8, nTargetPerSlot = 2 -> targetCopyEndSlotWithoutRemainder = 8 // 2 = 4
+						auto const targetCopyEndSlotWithoutRemainder = sourceLength / nTargetPerSlot;
+						// now we take into account the target remainder, i.e., the elements that were copied which did
+						// not fill up an entire target slot (sourceLength % nTargetPerSlot)
+						// and also add the number of source elements which are artificially copied as zeros if they
+						// were in a non-filled source slot
+						auto const numSlotsNeededForRemainder = [&]() -> u256
+						{
+							auto const targetCopyRemainder = sourceLength % nTargetPerSlot;
+							if (targetCopyRemainder + nSourceCarryOver == 0)
+								return 0;
+							// this is equivalent to ceil((targetCopyRemainder+nSourceCarryOver) / nTargetPerSlot)
+							return (targetCopyRemainder + nSourceCarryOver - 1) / nTargetPerSlot + 1;
+						}();
+						auto const updatedTargetCopyEndPos = targetCopyEndSlotWithoutRemainder + numSlotsNeededForRemainder;
+
+						// by copying the rest of the source elements of a slot that wasn't full, it can happen that we
+						// meet or even exceed the bounds of the target array - in this case we don't have to clean up
+						auto const targetRemainder = targetLength % nTargetPerSlot;
+						auto const targetEndSlot = targetLength / nTargetPerSlot + (targetRemainder > 0 ? 1 : 0);
+						if (updatedTargetCopyEndPos >= targetEndSlot)
+						{
+							_context << Instruction::POP << Instruction::POP;
+							return;
+						}
+					}
 				utils.clearStorageLoop(TypeProvider::uint256(), !targetType->isDynamicallySized());
+			}
 			else
 				utils.clearStorageLoop(targetBaseType, !targetType->isDynamicallySized());
 			_context << Instruction::POP;
@@ -775,7 +826,7 @@ void ArrayUtils::clearStorageLoop(Type const* _type, bool _canOverflow) const
 {
 	solAssert(_type->storageBytes() >= 32, "");
 	m_context.callLowLevelFunction(
-		"$clearStorageLoop_" + _type->identifier(),
+		"$clearStorageLoop_" + _type->identifier() + (_canOverflow ? "_canOverflow" : "cannotOverflow"),
 		2,
 		1,
 		[_type, _canOverflow](CompilerContext& _context)
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_overlapped_dynamic_arrays.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_overlapped_dynamic_arrays.sol
@@ -34,7 +34,7 @@ contract C {
 // f_which(uint256[],uint256[2],uint256): 0x40, 1, 2, 1 -> FAILURE
 // f_storage(uint256[],uint256[2]): 0x20, 1, 2 -> 0x20, 0x60, 0x20, 1, 2
 // gas irOptimized: 111409
-// gas legacy: 112707
+// gas legacy: 112704
 // gas legacyOptimized: 111845
 // f_storage(uint256[],uint256[2]): 0x40, 1, 2, 5, 6 -> 0x20, 0x80, 0x20, 2, 5, 6
 // f_storage(uint256[],uint256[2]): 0x40, 1, 2, 5 -> FAILURE
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/storage_array_encoding.sol b/test/libsolidity/semanticTests/abiEncoderV2/storage_array_encoding.sol
@@ -19,9 +19,9 @@ contract C {
 // ----
 // h(uint256[2][]): 0x20, 3, 123, 124, 223, 224, 323, 324 -> 32, 256, 0x20, 3, 123, 124, 223, 224, 323, 324
 // gas irOptimized: 180080
-// gas legacy: 184233
+// gas legacy: 184224
 // gas legacyOptimized: 180856
 // i(uint256[2][2]): 123, 124, 223, 224 -> 32, 128, 123, 124, 223, 224
 // gas irOptimized: 112031
-// gas legacy: 115091
+// gas legacy: 115082
 // gas legacyOptimized: 112657
diff --git a/test/libsolidity/semanticTests/array/arrays_complex_from_and_to_storage.sol b/test/libsolidity/semanticTests/array/arrays_complex_from_and_to_storage.sol
@@ -13,7 +13,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: 211054
+// gas legacy: 211036
 // gas legacyOptimized: 206077
 // data(uint256,uint256): 0x02, 0x02 -> 0x09
 // data(uint256,uint256): 0x05, 0x01 -> 0x11
diff --git a/test/libsolidity/semanticTests/array/constant_var_as_array_length.sol b/test/libsolidity/semanticTests/array/constant_var_as_array_length.sol
@@ -10,7 +10,7 @@ contract C {
 // constructor(): 1, 2, 3 ->
 // gas irOptimized: 124991
 // gas irOptimized code: 14800
-// gas legacy: 134317
+// gas legacy: 134298
 // gas legacy code: 46200
 // gas legacyOptimized: 127166
 // gas legacyOptimized code: 23400
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_calldata_storage.sol b/test/libsolidity/semanticTests/array/copying/array_copy_calldata_storage.sol
@@ -21,6 +21,6 @@ contract c {
 // ----
 // store(uint256[9],uint8[3][]): 21, 22, 23, 24, 25, 26, 27, 28, 29, 0x140, 4, 1, 2, 3, 11, 12, 13, 21, 22, 23, 31, 32, 33 -> 32
 // gas irOptimized: 647725
-// gas legacy: 694354
+// gas legacy: 694351
 // gas legacyOptimized: 693849
 // retrieve() -> 9, 28, 9, 28, 4, 3, 32
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_including_array.sol b/test/libsolidity/semanticTests/array/copying/array_copy_including_array.sol
@@ -36,7 +36,7 @@ contract c {
 // ----
 // test() -> 0x02000202
 // gas irOptimized: 4549676
-// gas legacy: 4473477
+// gas legacy: 4473198
 // gas legacyOptimized: 4445748
 // storageEmpty -> 1
 // clear() -> 0, 0
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_nested_array.sol b/test/libsolidity/semanticTests/array/copying/array_copy_nested_array.sol
@@ -13,5 +13,5 @@ contract c {
 // ----
 // test(uint256[2][]): 32, 3, 7, 8, 9, 10, 11, 12 -> 10
 // gas irOptimized: 689552
-// gas legacy: 686176
+// gas legacy: 686086
 // gas legacyOptimized: 685611
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base_nested.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base_nested.sol
@@ -22,5 +22,5 @@ contract c {
 // ----
 // test() -> 3, 4
 // gas irOptimized: 169602
-// gas legacy: 175415
+// gas legacy: 175289
 // gas legacyOptimized: 172533
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_static.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_static.sol
@@ -15,5 +15,5 @@ contract c {
 // ----
 // test() -> 8, 0
 // gas irOptimized: 196251
-// gas legacy: 194842
+// gas legacy: 194779
 // gas legacyOptimized: 194281
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover.sol b/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover.sol
@@ -18,5 +18,5 @@ contract c {
 // ----
 // test() -> 0xffffffff, 0x0000000000000000000000000a00090008000700060005000400030002000100, 0x0000000000000000000000000000000000000000000000000000000000000000
 // gas irOptimized: 100496
-// gas legacy: 158109
+// gas legacy: 158106
 // gas legacyOptimized: 141019
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_target_simple.sol b/test/libsolidity/semanticTests/array/copying/array_copy_target_simple.sol
@@ -19,5 +19,5 @@ contract c {
 // ----
 // test() -> 0x01000000000000000000000000000000000000000000000000, 0x02000000000000000000000000000000000000000000000000, 0x03000000000000000000000000000000000000000000000000, 0x04000000000000000000000000000000000000000000000000, 0x0
 // gas irOptimized: 273543
-// gas legacy: 282601
+// gas legacy: 282541
 // gas legacyOptimized: 281510
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_target_simple_2.sol b/test/libsolidity/semanticTests/array/copying/array_copy_target_simple_2.sol
@@ -19,5 +19,5 @@ contract c {
 // ----
 // test() -> 0x01000000000000000000000000000000000000000000000000, 0x02000000000000000000000000000000000000000000000000, 0x03000000000000000000000000000000000000000000000000, 0x04000000000000000000000000000000000000000000000000, 0x00
 // gas irOptimized: 232995
-// gas legacy: 235694
+// gas legacy: 235688
 // gas legacyOptimized: 235193
diff --git a/test/libsolidity/semanticTests/array/copying/copy_internal_function_array_to_storage.sol b/test/libsolidity/semanticTests/array/copying/copy_internal_function_array_to_storage.sol
@@ -18,6 +18,6 @@ contract C {
 }
 // ----
 // one() -> 3
-// gas legacy: 140253
+// gas legacy: 140250
 // gas legacyOptimized: 140093
 // two() -> FAILURE, hex"4e487b71", 0x51
diff --git a/test/libsolidity/semanticTests/array/copying/nested_array_element_storage_to_storage.sol b/test/libsolidity/semanticTests/array/copying/nested_array_element_storage_to_storage.sol
@@ -79,6 +79,6 @@ contract C {
 // gas legacyOptimized: 150575
 // test3() ->
 // gas irOptimized: 124300
-// gas legacy: 125333
+// gas legacy: 125330
 // gas legacyOptimized: 125127
 // test4() -> FAILURE
diff --git a/test/libsolidity/semanticTests/array/push/array_push_struct.sol b/test/libsolidity/semanticTests/array/push/array_push_struct.sol
@@ -21,5 +21,5 @@ contract c {
 // ----
 // test() -> 2, 3, 4, 5
 // gas irOptimized: 135329
-// gas legacy: 147437
+// gas legacy: 147434
 // gas legacyOptimized: 148715
diff --git a/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol b/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol
@@ -13,7 +13,7 @@ contract C {
 // constructor(): 1, 2, 3, 4 ->
 // gas irOptimized: 148129
 // gas irOptimized code: 23000
-// gas legacy: 157977
+// gas legacy: 157958
 // gas legacy code: 60400
 // gas legacyOptimized: 149973
 // gas legacyOptimized code: 26200
diff --git a/test/libsolidity/semanticTests/storage/storage_boundary_array_assignment.sol b/test/libsolidity/semanticTests/storage/storage_boundary_array_assignment.sol
@@ -18,6 +18,7 @@ contract C {
 // x() -> 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 // assignArray(uint256[10]): 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ->
 // gas irOptimized: 245236
+// gas legacy: 247487
 // gas legacyOptimized: 245441
 // x() -> 1, 2, 3, 4, 5, 6, 7, 8, 9, 10
 // assignArray(uint256[10]): 10, 20, 30, 40, 50, 60, 70, 80, 90, 100 ->
diff --git a/test/libsolidity/semanticTests/storage/storage_boundary_array_delete.sol b/test/libsolidity/semanticTests/storage/storage_boundary_array_delete.sol
@@ -24,6 +24,7 @@ contract C {
 // x() -> 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 // fillArray()
 // gas irOptimized: 220705
+// gas legacy: 221434
 // gas legacyOptimized: 220871
 // x() -> 0, 1, 2, 3, 4, 5, 6, 7, 8, 9
 // clearArray()
diff --git a/test/libsolidity/semanticTests/storage/storage_boundary_array_delete_overlapping_variable.sol b/test/libsolidity/semanticTests/storage/storage_boundary_array_delete_overlapping_variable.sol
@@ -28,6 +28,7 @@ contract C {
 // x() -> 0, 0, 0, 0, 0, 0x2a, 0, 0, 0, 0
 // fillArray()
 // gas irOptimized: 203627
+// gas legacy: 204356
 // gas legacyOptimized: 203793
 // y() -> 5
 // x() -> 0, 1, 2, 3, 4, 5, 6, 7, 8, 9
diff --git a/test/libsolidity/semanticTests/storage/storage_boundary_array_partial_assignment.sol b/test/libsolidity/semanticTests/storage/storage_boundary_array_partial_assignment.sol
@@ -24,6 +24,7 @@ contract C {
 // x() -> 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 // fillArray()
 // gas irOptimized: 220705
+// gas legacy: 221434
 // gas legacyOptimized: 220871
 // x() -> 0, 1, 2, 3, 4, 5, 6, 7, 8, 9
 // partialAssignArray()
diff --git a/test/libsolidity/semanticTests/storage/storage_boundary_array_partial_assignment_cross_border.sol b/test/libsolidity/semanticTests/storage/storage_boundary_array_partial_assignment_cross_border.sol
@@ -24,6 +24,7 @@ contract C {
 // x() -> 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 // fillArray()
 // gas irOptimized: 220705
+// gas legacy: 221434
 // gas legacyOptimized: 220871
 // x() -> 0, 1, 2, 3, 4, 5, 6, 7, 8, 9
 // partialAssignArray()
diff --git a/test/libsolidity/semanticTests/storage/storage_boundary_delete_array_with_layout.sol b/test/libsolidity/semanticTests/storage/storage_boundary_delete_array_with_layout.sol
@@ -36,11 +36,13 @@ contract C layout at 2**256 - 5 {
 // x() -> 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 // fillArray()
 // gas irOptimized: 220749
+// gas legacy: 221473
 // gas legacyOptimized: 220915
 // partialAssignArrayBeforeStorageBoundary()
 // x() -> 11, 12, 13, 0, 0, 0, 0, 0, 0, 0
 // fillArray()
 // gas irOptimized: 186549
+// gas legacy: 187273
 // gas legacyOptimized: 186715
 // x() -> 11, 1, 2, 3, 4, 5, 6, 7, 8, 9
 // partialAssignArrayCrossStorageBoundary()
diff --git a/test/libsolidity/semanticTests/storage/storage_boundary_delete_overflow_bug.sol b/test/libsolidity/semanticTests/storage/storage_boundary_delete_overflow_bug.sol
@@ -52,22 +52,29 @@ contract C {
 // ----
 // x() -> 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 // gas irOptimized: 604108
+// gas legacy: 644983
 // gas legacyOptimized: 598016
 // fillArray()
 // gas irOptimized: 5782148
+// gas legacy: 6044562
 // gas legacyOptimized: 5853893
 // x() -> 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f, 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf, 0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff
 // gas irOptimized: 604108
+// gas legacy: 644983
 // gas legacyOptimized: 598016
 // partialAssignArray()
 // gas irOptimized: 1065037
+// gas legacy: 1067333
 // gas legacyOptimized: 1065189
 // x() -> 11, 0x16, 0x21, 0x2c, 0x37, 0x42, 0x4d, 0x58, 0x63, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 // gas irOptimized: 604108
+// gas legacy: 644983
 // gas legacyOptimized: 598016
 // clearArray()
 // gas irOptimized: 578882
+// gas legacy: 581698
 // gas legacyOptimized: 578989
 // x() -> 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 // gas irOptimized: 604108
+// gas legacy: 644983
 // gas legacyOptimized: 598016
diff --git a/test/libsolidity/semanticTests/storage/storage_boundary_packed_array.sol b/test/libsolidity/semanticTests/storage/storage_boundary_packed_array.sol
@@ -24,6 +24,7 @@ contract C {
 // x() -> 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 // fillArray()
 // gas irOptimized: 254227
+// gas legacy: 258712
 // gas legacyOptimized: 257258
 // x() -> 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27
 // clearArray()
diff --git a/test/libsolidity/semanticTests/storage/storage_packed_array_copy.sol b/test/libsolidity/semanticTests/storage/storage_packed_array_copy.sol
@@ -23,3 +23,5 @@ contract C {
 // ----
 // f() -> 0x01000000000000000000000000000000000000000000000000, 0x02000000000000000000000000000000000000000000000000, 0x03000000000000000000000000000000000000000000000000, 0x04000000000000000000000000000000000000000000000000, 0x00
 // gas irOptimized: 191520
+// gas legacy: 199338
+
diff --git a/test/libsolidity/semanticTests/types/mapping/copy_from_mapping_to_mapping.sol b/test/libsolidity/semanticTests/types/mapping/copy_from_mapping_to_mapping.sol
@@ -30,5 +30,5 @@ 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 legacy: 199884
 // gas legacyOptimized: 203694
