fixup! Use MCOPY when copying byte arrays

ethereum · Feb 7, 2024 · c67dfe2 · c67dfe2
1 parent 46621e5
commit c67dfe2
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 25 deletions.
diff --git a/libsolidity/codegen/YulUtilFunctions.cpp b/libsolidity/codegen/YulUtilFunctions.cpp
@@ -88,47 +88,34 @@ std::string YulUtilFunctions::copyToMemoryFunction(bool _fromCalldata, bool _cle
 		"_to_memory"s +
 		(_cleanup ? "_with_cleanup"s : ""s);
 
-	return m_functionCollector.createFunction(functionName, [&]() {
-		// calldata -> memory
+	return m_functionCollector.createFunction(functionName, [&](std::vector<std::string>& _args, std::vector<std::string>&) {
+		_args = {"src", "dst", "length"};
+
 		if (_fromCalldata)
-		{
 			return Whiskers(R"(
-				function <functionName>(src, dst, length) {
-					calldatacopy(dst, src, length)
-					<?cleanup>mstore(add(dst, length), 0)</cleanup>
-				}
+				calldatacopy(dst, src, length)
+				<?cleanup>mstore(add(dst, length), 0)</cleanup>
 			)")
-			("functionName", functionName)
 			("cleanup", _cleanup)
 			.render();
-		}
-		// memory -> memory
 		else
 		{
-			// use MCOPY (cancun+)
 			if (m_evmVersion.hasMcopy())
 				return Whiskers(R"(
-					function <functionName>(src, dst, length) {
-						mcopy(dst, src, length)
-						<?cleanup>mstore(add(dst, length), 0)</cleanup>
-					}
+					mcopy(dst, src, length)
+					<?cleanup>mstore(add(dst, length), 0)</cleanup>
 				)")
-				("functionName", functionName)
 				("cleanup", _cleanup)
 				.render();
-			// mstore mload loop
 			else
 				return Whiskers(R"(
-					function <functionName>(src, dst, length) {
-						let i := 0
-						for { } lt(i, length) { i := add(i, 32) }
-						{
-							mstore(add(dst, i), mload(add(src, i)))
-						}
-						<?cleanup>mstore(add(dst, length), 0)</cleanup>
+					let i := 0
+					for { } lt(i, length) { i := add(i, 32) }
+					{
+						mstore(add(dst, i), mload(add(src, i)))
 					}
+					<?cleanup>mstore(add(dst, length), 0)</cleanup>
 				)")
-				("functionName", functionName)
 				("cleanup", _cleanup)
 				.render();
 		}

diff --git a/test/cmdlineTests/mcopy_bytes_array_returned_from_function/output b/test/cmdlineTests/mcopy_bytes_array_returned_from_function/output
@@ -86,8 +86,10 @@ object "C_14" {
             }
 
             function copy_memory_to_memory_with_cleanup(src, dst, length) {
+
                 mcopy(dst, src, length)
                 mstore(add(dst, length), 0)
+
             }
 
             function round_up_to_mul_of_32(value) -> result {

diff --git a/test/cmdlineTests/mcopy_string_literal_returned_from_function/output b/test/cmdlineTests/mcopy_string_literal_returned_from_function/output
@@ -86,8 +86,10 @@ object "C_10" {
             }
 
             function copy_memory_to_memory_with_cleanup(src, dst, length) {
+
                 mcopy(dst, src, length)
                 mstore(add(dst, length), 0)
+
             }
 
             function round_up_to_mul_of_32(value) -> result {