f

clonker · clonker · commit fb02b92dc6a1 · 2025-05-05T18:50:04.000+02:00
diff --git a/libsolidity/codegen/ArrayUtils.cpp b/libsolidity/codegen/ArrayUtils.cpp
@@ -320,12 +320,8 @@ void ArrayUtils::copyArrayToStorage(ArrayType const& _targetType, ArrayType cons
 
 						auto const nTargetCopyCarryOver = nTargetPerSlot - targetCopyRemainder;
 						auto const nSourceCarryOver = nSourcePerSlot - sourceRemainder;
-
-						fmt::print("\n\n\nnSourceCarryOver = {}, targetCopyRemainder = {}, copyTargetEndSlot = {}, mod = {}, targetEndSlot = {}\n", nSourceCarryOver.str(), targetCopyRemainder.str(), targetCopyEndSlot.str(), ((nSourceCarryOver - targetCopyRemainder) / nTargetPerSlot).str(), targetEndSlot.str());
-						fmt::print("nSourcePerSlot = {}, nTargetPerSlot = {}\n", nSourcePerSlot, nTargetPerSlot);
 						if (nSourceCarryOver > nTargetCopyCarryOver && targetCopyEndSlot + (nSourceCarryOver - nTargetCopyCarryOver) / nTargetPerSlot > targetEndSlot)
 						{
-							fmt::print("skipping clearStorageLoop\n");
 							_context << Instruction::POP << Instruction::POP;
 							return;
 						}
@@ -816,7 +812,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/SemanticTest.cpp b/test/libsolidity/SemanticTest.cpp
@@ -106,7 +106,6 @@ SemanticTest::SemanticTest(
 		BOOST_THROW_EXCEPTION(std::runtime_error("Invalid compileViaYul value: " + compileViaYul + "."));
 	m_testCaseWantsYulRun = util::contains(yulRunTriggers, compileViaYul);
 	m_testCaseWantsLegacyRun = util::contains(legacyRunTriggers, compileViaYul);
-	m_testCaseWantsYulRun = false;
 
 	auto revertStrings = revertStringsFromString(m_reader.stringSetting("revertStrings", "default"));
 	soltestAssert(revertStrings, "Invalid revertStrings setting.");
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
@@ -23,5 +23,5 @@ contract C {
 // gas legacyOptimized: 180856
 // i(uint256[2][2]): 123, 124, 223, 224 -> 32, 128, 123, 124, 223, 224
 // gas irOptimized: 112031
-// gas legacy: 115085
+// gas legacy: 115082
 // gas legacyOptimized: 112657
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_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/array_of_function_external_storage_to_storage_dynamic_different_mutability.sol b/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic_different_mutability.sol
@@ -49,7 +49,7 @@ contract C {
 // ----
 // copyExternalStorageArraysOfFunctionType() -> true
 // gas irOptimized: 104238
-// gas legacy: 108235
+// gas legacy: 108295
 // gas legacyOptimized: 102162
 // copyInternalArrayOfFunctionType() -> true
 // gas legacy: 104178
diff --git a/test/libsolidity/semanticTests/array/copying/array_to_mapping.sol b/test/libsolidity/semanticTests/array/copying/array_to_mapping.sol
@@ -38,7 +38,7 @@ contract C {
 // ----
 // from_storage() -> 0x20, 2, 0x40, 0xa0, 2, 10, 11, 3, 12, 13, 14
 // gas irOptimized: 147755
-// gas legacy: 148772
+// gas legacy: 148892
 // gas legacyOptimized: 146917
 // from_storage_ptr() -> 0x20, 2, 0x40, 0xa0, 2, 10, 11, 3, 12, 13, 14
 // from_memory() -> 0x20, 2, 0x40, 0xa0, 2, 10, 11, 3, 12, 13, 14
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
@@ -16,14 +16,40 @@ contract C {
         src1[1][0] = [3, 4];
         src1[1][1] = [5, 6];
 
+        src2[0] = new uint8[][](2);
+        src2[0][0] = [6, 7];
+        src2[0][1] = [8, 9];
+        src2[1] = new uint8[][](2);
+        src2[1][0] = [10, 11];
 
+        src3[0][0] = [3, 4];
+        src3[0][1] = [5, 6];
+
+        src4[0] = new uint8[2][](1);
+        src4[0][0] = [17, 23];
+        src4[1] = new uint8[2][](1);
+        src4[1][0] = [19, 31];
     }
 
     function test1() public {
         dst1 = src1[1];
 
+        require(dst1.length == 2);
+        require(dst1[0][0] == src1[1][0][0]);
+        require(dst1[0][1] == src1[1][0][1]);
+        require(dst1[1][0] == src1[1][1][0]);
+        require(dst1[1][1] == src1[1][1][1]);
     }
 
+    function test2() public {
+        dst2 = src2[0];
+
+        require(dst2.length == 2);
+        require(dst2[0][0] == src2[1][0][0]);
+        require(dst2[0][1] == src2[1][0][1]);
+        require(dst2[1][0] == src2[1][1][0]);
+        require(dst2[1][1] == src2[1][1][1]);
+    }
 
     function test3() public {
         dst3 = src3[0];
@@ -47,8 +73,12 @@ contract C {
 // gas irOptimized: 150488
 // gas legacy: 150949
 // gas legacyOptimized: 150906
+// test2() -> FAILURE
+// gas irOptimized: 150389
+// gas legacy: 150672
+// gas legacyOptimized: 150575
 // test3() ->
 // gas irOptimized: 124300
-// gas legacy: 125210
+// gas legacy: 125330
 // gas legacyOptimized: 125127
 // test4() -> FAILURE
diff --git a/test/libsolidity/semanticTests/array/pop/array_pop_array_transition.sol b/test/libsolidity/semanticTests/array/pop/array_pop_array_transition.sol
@@ -24,6 +24,6 @@ contract c {
 // ----
 // test() -> 1, 2, 3
 // gas irOptimized: 1828226
-// gas legacy: 1820160
+// gas legacy: 1822464
 // gas legacyOptimized: 1813404
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/push/array_push_nested_from_calldata.sol b/test/libsolidity/semanticTests/array/push/array_push_nested_from_calldata.sol
@@ -13,5 +13,5 @@ contract C {
 // ----
 // f(uint120[]): 0x20, 3, 1, 2, 3 -> 1
 // gas irOptimized: 112852
-// gas legacy: 113597
+// gas legacy: 113657
 // gas legacyOptimized: 113465
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: 147374
+// gas legacy: 147434
 // gas legacyOptimized: 148715
diff --git a/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol b/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
@@ -28,7 +28,7 @@ contract Creator {
 // f(uint256,address[]): 7, 0x40, 10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 -> 7, 8
 // gas irOptimized: 327784
 // gas irOptimized code: 94000
-// gas legacy: 336554
+// gas legacy: 336623
 // gas legacy code: 244800
 // gas legacyOptimized: 329515
 // gas legacyOptimized code: 117000
diff --git a/test/libsolidity/semanticTests/structs/copy_from_mapping.sol b/test/libsolidity/semanticTests/structs/copy_from_mapping.sol
@@ -37,7 +37,7 @@ contract C {
 // ----
 // to_state() -> 0x20, 0x60, 0xa0, 7, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
 // gas irOptimized: 121282
-// gas legacy: 122917
+// gas legacy: 122977
 // gas legacyOptimized: 121652
 // to_storage() -> 0x20, 0x60, 0xa0, 7, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
 // to_memory() -> 0x20, 0x60, 0xa0, 7, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
diff --git a/test/libsolidity/semanticTests/structs/copy_substructures_from_mapping.sol b/test/libsolidity/semanticTests/structs/copy_substructures_from_mapping.sol
@@ -45,7 +45,7 @@ contract C {
 // ----
 // to_state() -> 0x20, 0x60, 0xa0, 7, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
 // gas irOptimized: 121454
-// gas legacy: 123054
+// gas legacy: 123114
 // gas legacyOptimized: 121659
 // to_storage() -> 0x20, 0x60, 0xa0, 7, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
 // to_memory() -> 0x20, 0x60, 0xa0, 7, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
diff --git a/test/libsolidity/semanticTests/structs/copy_substructures_to_mapping.sol b/test/libsolidity/semanticTests/structs/copy_substructures_to_mapping.sol
@@ -53,13 +53,13 @@ contract C {
 // ----
 // from_memory() -> 0x20, 0x60, 0xa0, 0x15, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
 // gas irOptimized: 122720
-// gas legacy: 130071
+// gas legacy: 130131
 // gas legacyOptimized: 128648
 // from_state() -> 0x20, 0x60, 0xa0, 21, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
 // gas irOptimized: 121424
-// gas legacy: 123130
+// gas legacy: 123190
 // gas legacyOptimized: 121758
 // from_calldata((bytes,uint16[],uint16)): 0x20, 0x60, 0xa0, 21, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14 -> 0x20, 0x60, 0xa0, 0x15, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
 // gas irOptimized: 114852
-// gas legacy: 122363
+// gas legacy: 122423
 // gas legacyOptimized: 120698
diff --git a/test/libsolidity/semanticTests/structs/copy_to_mapping.sol b/test/libsolidity/semanticTests/structs/copy_to_mapping.sol
@@ -46,15 +46,15 @@ contract C {
 // ----
 // from_state() -> 0x20, 0x60, 0xa0, 21, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
 // gas irOptimized: 121515
-// gas legacy: 122991
+// gas legacy: 123051
 // gas legacyOptimized: 121704
 // from_storage() -> 0x20, 0x60, 0xa0, 21, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
 // gas irOptimized: 121559
-// gas legacy: 123049
+// gas legacy: 123109
 // gas legacyOptimized: 121756
 // from_memory() -> 0x20, 0x60, 0xa0, 21, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
 // gas irOptimized: 122740
-// gas legacy: 129936
+// gas legacy: 129996
 // gas legacyOptimized: 128644
 // from_calldata((bytes,uint16[],uint16)): 0x20, 0x60, 0xa0, 21, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14 -> 0x20, 0x60, 0xa0, 21, 3, 0x666f6f0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
 // gas irOptimized: 114824
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
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol b/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol
@@ -50,11 +50,11 @@ contract C {
 // ----
 // test_f() -> true
 // gas irOptimized: 122201
-// gas legacy: 125273
+// gas legacy: 125333
 // gas legacyOptimized: 122693
 // test_g() -> true
 // gas irOptimized: 106408
-// gas legacy: 111073
+// gas legacy: 111133
 // gas legacyOptimized: 106925
 // addresses(uint256): 0 -> 0x18
 // addresses(uint256): 1 -> 0x19
