Execute JUMPDEST immediately after JUMP/JUMPI

matter-labs · Aug 19, 2024 · 6691c88 · 6691c88
1 parent 462f011
commit 6691c88
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/system-contracts/contracts/EvmInterpreterLoop.template.yul b/system-contracts/contracts/EvmInterpreterLoop.template.yul
@@ -742,6 +742,10 @@ for { } true { } {
         if iszero(eq(nextOpcode, 0x5B)) {
             revertWithGas(evmGasLeft)
         }
+
+        // execute JUMPDEST immediately
+        evmGasLeft := chargeGas(evmGasLeft, 1)
+        ip := add(ip, 1)
     }
     case 0x57 { // OP_JUMPI
         evmGasLeft := chargeGas(evmGasLeft, 10)
@@ -764,6 +768,10 @@ for { } true { } {
         if iszero(eq(nextOpcode, 0x5B)) {
             revertWithGas(evmGasLeft)
         }
+
+        // execute JUMPDEST immediately
+        evmGasLeft := chargeGas(evmGasLeft, 1)
+        ip := add(ip, 1)
     }
     case 0x58 { // OP_PC
         evmGasLeft := chargeGas(evmGasLeft, 2)

diff --git a/system-contracts/contracts/EvmInterpreterPreprocessed.yul b/system-contracts/contracts/EvmInterpreterPreprocessed.yul
@@ -2290,6 +2290,10 @@ object "EVMInterpreter" {
                     if iszero(eq(nextOpcode, 0x5B)) {
                         revertWithGas(evmGasLeft)
                     }
+
+                    // execute JUMPDEST immediately
+                    evmGasLeft := chargeGas(evmGasLeft, 1)
+                    ip := add(ip, 1)
                 }
                 case 0x57 { // OP_JUMPI
                     evmGasLeft := chargeGas(evmGasLeft, 10)
@@ -2312,6 +2316,10 @@ object "EVMInterpreter" {
                     if iszero(eq(nextOpcode, 0x5B)) {
                         revertWithGas(evmGasLeft)
                     }
+
+                    // execute JUMPDEST immediately
+                    evmGasLeft := chargeGas(evmGasLeft, 1)
+                    ip := add(ip, 1)
                 }
                 case 0x58 { // OP_PC
                     evmGasLeft := chargeGas(evmGasLeft, 2)
@@ -5286,6 +5294,10 @@ object "EVMInterpreter" {
                         if iszero(eq(nextOpcode, 0x5B)) {
                             revertWithGas(evmGasLeft)
                         }
+
+                        // execute JUMPDEST immediately
+                        evmGasLeft := chargeGas(evmGasLeft, 1)
+                        ip := add(ip, 1)
                     }
                     case 0x57 { // OP_JUMPI
                         evmGasLeft := chargeGas(evmGasLeft, 10)
@@ -5308,6 +5320,10 @@ object "EVMInterpreter" {
                         if iszero(eq(nextOpcode, 0x5B)) {
                             revertWithGas(evmGasLeft)
                         }
+
+                        // execute JUMPDEST immediately
+                        evmGasLeft := chargeGas(evmGasLeft, 1)
+                        ip := add(ip, 1)
                     }
                     case 0x58 { // OP_PC
                         evmGasLeft := chargeGas(evmGasLeft, 2)