eof: Fix EOF builtin names unintentionally reserved outside of EOF

ethereum · Jan 9, 2025 · 7c98754 · 7c98754
1 parent 3c94682
commit 7c98754
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 1 deletion.
diff --git a/libyul/backends/evm/EVMDialect.cpp b/libyul/backends/evm/EVMDialect.cpp
@@ -161,7 +161,15 @@ std::set<std::string, std::less<>> createReservedIdentifiers(langutil::EVMVersio
 			(
 				_instr == evmasm::Instruction::EXTCALL ||
 				_instr == evmasm::Instruction::EXTSTATICCALL ||
-				_instr == evmasm::Instruction::EXTDELEGATECALL
+				_instr == evmasm::Instruction::EXTDELEGATECALL ||
+				_instr == evmasm::Instruction::DATALOADN ||
+				_instr == evmasm::Instruction::EOFCREATE ||
+				_instr == evmasm::Instruction::RETURNCONTRACT ||
+				_instr == evmasm::Instruction::RJUMP ||
+				_instr == evmasm::Instruction::RJUMPI ||
+				_instr == evmasm::Instruction::CALLF ||
+				_instr == evmasm::Instruction::JUMPF ||
+				_instr == evmasm::Instruction::RETF
 			);
 	};
 

diff --git a/test/libyul/yulSyntaxTests/eof/eof_builtins_names_reserved.yul b/test/libyul/yulSyntaxTests/eof/eof_builtins_names_reserved.yul
@@ -0,0 +1,20 @@
+object "a" {
+    code {
+        function dataloadn() {}
+        function rjump() {}
+        function rjumpi() {}
+        function callf() {}
+        function jumpf() {}
+        function retf() {}
+    }
+}
+
+// ====
+// bytecodeFormat: >=EOFv1
+// ----
+// DeclarationError 5017: (32-55): The identifier "dataloadn" is reserved and can not be used.
+// DeclarationError 5017: (64-83): The identifier "rjump" is reserved and can not be used.
+// DeclarationError 5017: (92-112): The identifier "rjumpi" is reserved and can not be used.
+// DeclarationError 5017: (121-140): The identifier "callf" is reserved and can not be used.
+// DeclarationError 5017: (149-168): The identifier "jumpf" is reserved and can not be used.
+// DeclarationError 5017: (177-195): The identifier "retf" is reserved and can not be used.
diff --git a/test/libyul/yulSyntaxTests/eof/eof_identifiers_in_legacy.yul b/test/libyul/yulSyntaxTests/eof/eof_identifiers_in_legacy.yul
@@ -1,5 +1,13 @@
 object "a" {
     code {
+        function dataloadn() {}
+        function eofcreate() {}
+        function returncontract() {}
+        function rjump() {}
+        function rjumpi() {}
+        function callf() {}
+        function jumpf() {}
+        function retf() {}
         function extcall() {}
         function extstaticcall() {}
         function extdelegatecall() {}