Use _fetchDeployedCodeLen for both code types

matter-labs · Aug 28, 2024 · 448bc97 · 448bc97
1 parent 89245ad
commit 448bc97
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/system-contracts/contracts/EvmInterpreterLoop.template.yul b/system-contracts/contracts/EvmInterpreterLoop.template.yul
@@ -480,9 +480,7 @@ for { } true { } {
             evmGasLeft := chargeGas(evmGasLeft, 2500)
         }
 
-        switch _isEVM(addr) 
-            case 0  { sp := pushStackItemWithoutCheck(sp, extcodesize(addr)) }
-            default { sp := pushStackItemWithoutCheck(sp, _fetchDeployedCodeLen(addr)) }
+        sp := pushStackItemWithoutCheck(sp, _fetchDeployedCodeLen(addr))
         ip := add(ip, 1)
     }
     case 0x3C { // OP_EXTCODECOPY

diff --git a/system-contracts/contracts/EvmInterpreterPreprocessed.yul b/system-contracts/contracts/EvmInterpreterPreprocessed.yul
@@ -2010,9 +2010,7 @@ object "EVMInterpreter" {
                         evmGasLeft := chargeGas(evmGasLeft, 2500)
                     }
 
-                    switch _isEVM(addr) 
-                        case 0  { sp := pushStackItemWithoutCheck(sp, extcodesize(addr)) }
-                        default { sp := pushStackItemWithoutCheck(sp, _fetchDeployedCodeLen(addr)) }
+                    sp := pushStackItemWithoutCheck(sp, _fetchDeployedCodeLen(addr))
                     ip := add(ip, 1)
                 }
                 case 0x3C { // OP_EXTCODECOPY
@@ -4969,9 +4967,7 @@ object "EVMInterpreter" {
                             evmGasLeft := chargeGas(evmGasLeft, 2500)
                         }
 
-                        switch _isEVM(addr) 
-                            case 0  { sp := pushStackItemWithoutCheck(sp, extcodesize(addr)) }
-                            default { sp := pushStackItemWithoutCheck(sp, _fetchDeployedCodeLen(addr)) }
+                        sp := pushStackItemWithoutCheck(sp, _fetchDeployedCodeLen(addr))
                         ip := add(ip, 1)
                     }
                     case 0x3C { // OP_EXTCODECOPY