Reduce megamorphic call sites in AbstractCallOperation (hyperledger#4288

) The four instances of gas in the CALL operations are all implemented identically. Refactor the method into the abstract parent. Signed-off-by: Danno Ferrin <danno.ferrin@gmail.com>
lacchain · Nov 3, 2023 · f93c1a5 · f93c1a5
1 parent 862eb51
commit f93c1a5
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 37 deletions.
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/AbstractCallOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/AbstractCallOperation.java
@@ -14,6 +14,8 @@
  */
 package org.hyperledger.besu.evm.operation;
 
+import static org.hyperledger.besu.evm.internal.Words.clampedToLong;
+
 import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.evm.Code;
@@ -57,7 +59,9 @@ protected AbstractCallOperation(
    * @param frame The current message frame
    * @return the additional gas to provide the call operation
    */
-  protected abstract long gas(MessageFrame frame);
+  protected long gas(final MessageFrame frame) {
+    return clampedToLong(frame.getStackItem(0));
+  }
 
   /**
    * Returns the account the call is being made to.

diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/CallCodeOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/CallCodeOperation.java
@@ -29,15 +29,6 @@ public CallCodeOperation(final GasCalculator gasCalculator) {
     super(0xF2, "CALLCODE", 7, 1, 1, gasCalculator);
   }
 
-  @Override
-  protected long gas(final MessageFrame frame) {
-    try {
-      return frame.getStackItem(0).trimLeadingZeros().toLong();
-    } catch (final ArithmeticException | IllegalArgumentException ae) {
-      return Long.MAX_VALUE;
-    }
-  }
-
   @Override
   protected Address to(final MessageFrame frame) {
     return Words.toAddress(frame.getStackItem(1));

diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/CallOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/CallOperation.java
@@ -34,15 +34,6 @@ public CallOperation(final GasCalculator gasCalculator) {
     super(0xF1, "CALL", 7, 1, 1, gasCalculator);
   }
 
-  @Override
-  protected long gas(final MessageFrame frame) {
-    try {
-      return frame.getStackItem(0).trimLeadingZeros().toLong();
-    } catch (final ArithmeticException | IllegalArgumentException ae) {
-      return Long.MAX_VALUE;
-    }
-  }
-
   @Override
   protected Address to(final MessageFrame frame) {
     return Words.toAddress(frame.getStackItem(1));

diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/DelegateCallOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/DelegateCallOperation.java
@@ -29,15 +29,6 @@ public DelegateCallOperation(final GasCalculator gasCalculator) {
     super(0xF4, "DELEGATECALL", 6, 1, 1, gasCalculator);
   }
 
-  @Override
-  protected long gas(final MessageFrame frame) {
-    try {
-      return frame.getStackItem(0).trimLeadingZeros().toLong();
-    } catch (final ArithmeticException | IllegalArgumentException ae) {
-      return Long.MAX_VALUE;
-    }
-  }
-
   @Override
   protected Address to(final MessageFrame frame) {
     return Words.toAddress(frame.getStackItem(1));

diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/StaticCallOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/StaticCallOperation.java
@@ -29,15 +29,6 @@ public StaticCallOperation(final GasCalculator gasCalculator) {
     super(0xFA, "STATICCALL", 6, 1, 1, gasCalculator);
   }
 
-  @Override
-  protected long gas(final MessageFrame frame) {
-    try {
-      return frame.getStackItem(0).trimLeadingZeros().toLong();
-    } catch (final ArithmeticException | IllegalArgumentException ae) {
-      return Long.MAX_VALUE;
-    }
-  }
-
   @Override
   protected Address to(final MessageFrame frame) {
     return Words.toAddress(frame.getStackItem(1));