Merge pull request ethereum#13514 from ethereum/yul-interpreter-create2

Fix create2 memory access in yul interpreter.
blueplanet · Sep 14, 2022 · 1730e43 · 1730e43
2 parents f05cbb9 + 69d9869
commit 1730e43
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/test/libyul/yulInterpreterTests/create2.yul b/test/libyul/yulInterpreterTests/create2.yul
@@ -0,0 +1,13 @@
+{
+    pop(create2(0, 0, 32, 32))
+    // This used to store 64
+    sstore(0, msize())
+}
+// ====
+// EVMVersion: >=constantinople
+// ----
+// Trace:
+//   CREATE2(0, 0, 32, 32)
+// Memory dump:
+// Storage dump:
+//   0000000000000000000000000000000000000000000000000000000000000000: 0000000000000000000000000000000000000000000000000000000000000020
diff --git a/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp b/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
@@ -317,7 +317,7 @@ u256 EVMInstructionInterpreter::eval(
 		logTrace(_instruction, arg);
 		return (0xcccccc + arg[1]) & u256("0xffffffffffffffffffffffffffffffffffffffff");
 	case Instruction::CREATE2:
-		accessMemory(arg[2], arg[3]);
+		accessMemory(arg[1], arg[2]);
 		logTrace(_instruction, arg);
 		return (0xdddddd + arg[1]) & u256("0xffffffffffffffffffffffffffffffffffffffff");
 	case Instruction::CALL: