Move FrameAccess.savedBasePointerSize to Deoptimizer

Author: pejovica

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/FrameAccess.java

@@ -68,13 +68,6 @@ public static int returnAddressSize() {
     @Fold
     public abstract int stackPointerAdjustmentOnCall();
 
-    /**
-     * Returns the size in bytes of the saved base pointer in the stack frame. The saved base
-     * pointer must be located immediately after the return address (if this is not the case in a
-     * new architecture, bigger modifications to code like the Deoptimizer is required).
-     */
-    public abstract int savedBasePointerSize();
-
     @Fold
     public static int wordSize() {
         return ConfigurationValues.getTarget().arch.getWordSize();

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/aarch64/AArch64FrameAccess.java

@@ -24,7 +24,6 @@
  */
 package com.oracle.svm.core.aarch64;
 
-import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.nativeimage.c.function.CodePointer;
@@ -36,6 +35,8 @@
 import com.oracle.svm.core.feature.AutomaticallyRegisteredImageSingleton;
 import com.oracle.svm.core.graal.nodes.aarch64.AArch64XPACNode;
 
+import jdk.graal.compiler.api.replacements.Fold;
+
 @AutomaticallyRegisteredImageSingleton(FrameAccess.class)
 @Platforms(Platform.AARCH64.class)
 public class AArch64FrameAccess extends FrameAccess {
@@ -63,13 +64,6 @@ public Pointer getReturnAddressLocation(Pointer sourceSp) {
         return sourceSp.subtract(returnAddressSize());
     }
 
-    @Fold
-    @Override
-    public int savedBasePointerSize() {
-        // The base pointer is always saved with stp instruction on method entry
-        return wordSize();
-    }
-
     @Override
     @Fold
     public int stackPointerAdjustmentOnCall() {

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/amd64/AMD64FrameAccess.java

@@ -24,17 +24,17 @@
  */
 package com.oracle.svm.core.amd64;
 
-import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.Platform.AMD64;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.nativeimage.c.function.CodePointer;
 import org.graalvm.word.Pointer;
 
 import com.oracle.svm.core.FrameAccess;
-import com.oracle.svm.core.SubstrateOptions;
 import com.oracle.svm.core.Uninterruptible;
 import com.oracle.svm.core.feature.AutomaticallyRegisteredImageSingleton;
 
+import jdk.graal.compiler.api.replacements.Fold;
+
 @AutomaticallyRegisteredImageSingleton(FrameAccess.class)
 @Platforms(AMD64.class)
 public final class AMD64FrameAccess extends FrameAccess {
@@ -58,16 +58,6 @@ public Pointer getReturnAddressLocation(Pointer sourceSp) {
         return sourceSp.subtract(returnAddressSize());
     }
 
-    @Fold
-    @Override
-    public int savedBasePointerSize() {
-        if (SubstrateOptions.PreserveFramePointer.getValue()) {
-            return wordSize();
-        } else {
-            return 0;
-        }
-    }
-
     @Override
     @Fold
     public int stackPointerAdjustmentOnCall() {

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/deopt/Deoptimizer.java

@@ -33,7 +33,9 @@
 import java.util.ArrayList;
 
 import org.graalvm.nativeimage.CurrentIsolate;
+import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.IsolateThread;
+import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.c.function.CodePointer;
 import org.graalvm.word.Pointer;
 import org.graalvm.word.PointerBase;
@@ -82,6 +84,7 @@
 import com.oracle.svm.core.util.TimeUtils;
 import com.oracle.svm.core.util.VMError;
 
+import jdk.graal.compiler.api.replacements.Fold;
 import jdk.graal.compiler.core.common.NumUtil;
 import jdk.graal.compiler.core.common.util.TypeConversion;
 import jdk.graal.compiler.options.Option;
@@ -611,7 +614,7 @@ private static UnsignedWord rewriteStackStub(Pointer newSp, UnsignedWord gpRetur
          * deoptimizeInRange(). So when this method returns we are inside the caller of
          * deoptimizeInRange().
          */
-        Pointer bottomSp = newSp.subtract(FrameAccess.returnAddressSize() + FrameAccess.singleton().savedBasePointerSize());
+        Pointer bottomSp = newSp.subtract(FrameAccess.returnAddressSize() + savedBasePointerSize());
         frame.getTargetContent().copyToPointer(bottomSp);
 
         if (DeoptimizationCounters.Options.ProfileDeoptimization.getValue()) {
@@ -621,6 +624,25 @@ private static UnsignedWord rewriteStackStub(Pointer newSp, UnsignedWord gpRetur
         return gpReturnValue;
     }
 
+    /**
+     * Returns the size in bytes of the saved base pointer in the stack frame. The saved base
+     * pointer must be located immediately after the return address (if this is not the case in a
+     * new architecture, bigger modifications to the Deoptimizer code are required).
+     */
+    @Fold
+    static int savedBasePointerSize() {
+        if (Platform.includedIn(Platform.AMD64.class)) {
+            return SubstrateOptions.PreserveFramePointer.getValue() ? FrameAccess.wordSize() : 0;
+        } else if (Platform.includedIn(Platform.AARCH64.class)) {
+            // The base pointer is always saved with stp instruction on method entry
+            return FrameAccess.wordSize();
+        } else if (Platform.includedIn(Platform.RISCV64.class)) {
+            // The base pointer is always pushed on the stack on method entry
+            return FrameAccess.wordSize();
+        }
+        throw VMError.shouldNotReachHere("Unexpected platform: " + ImageSingletons.lookup(Platform.class));
+    }
+
     /**
      * Reads the value of a local variable in the given frame. If the local variable is a virtual
      * object, the object (and all other objects reachable from it) are materialized.
@@ -799,7 +821,7 @@ public static void logRecentDeoptimizationEvents(Log log) {
      */
     private VirtualFrame constructTargetFrame(CodeInfoQueryResult targetInfo, FrameInfoQueryResult sourceFrame) {
         FrameInfoQueryResult targetFrame = targetInfo.getFrameInfo();
-        int savedBasePointerSize = FrameAccess.singleton().savedBasePointerSize();
+        int savedBasePointerSize = savedBasePointerSize();
         int targetFrameSize = NumUtil.safeToInt(targetInfo.getTotalFrameSize()) - FrameAccess.returnAddressSize() - savedBasePointerSize;
         VirtualFrame result = new VirtualFrame(targetFrame);
 

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/sampler/AbstractJfrExecutionSampler.java

@@ -332,7 +332,7 @@ private static void doUninterruptibleStackWalk(SamplerSampleWriterData data, Poi
                  * We are in the prologue or epilogue. Frame pointer and return address are on top
                  * of the stack.
                  */
-                callerSP = sp.add(FrameAccess.wordSize()).add(FrameAccess.singleton().savedBasePointerSize());
+                callerSP = sp.add(FrameAccess.wordSize()).add(FrameAccess.wordSize());
             }
         } else {
             /* We are in the prologue or epilogue. Return address is at the top of the stack. */

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/riscv64/RISCV64FrameAccess.java

@@ -24,7 +24,6 @@
  */
 package com.oracle.svm.core.riscv64;
 
-import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.nativeimage.c.function.CodePointer;
@@ -34,6 +33,8 @@
 import com.oracle.svm.core.Uninterruptible;
 import com.oracle.svm.core.feature.AutomaticallyRegisteredImageSingleton;
 
+import jdk.graal.compiler.api.replacements.Fold;
+
 @AutomaticallyRegisteredImageSingleton(FrameAccess.class)
 @Platforms(Platform.RISCV64.class)
 public class RISCV64FrameAccess extends FrameAccess {
@@ -56,13 +57,6 @@ public Pointer getReturnAddressLocation(Pointer sourceSp) {
         return sourceSp.subtract(returnAddressSize());
     }
 
-    @Fold
-    @Override
-    public int savedBasePointerSize() {
-        // The base pointer is always pushed on the stack on method entry
-        return wordSize();
-    }
-
     @Override
     @Fold
     public int stackPointerAdjustmentOnCall() {