[GR-51542] Fix rbp handling when configuring registers on Windows.

PullRequest: graal/16721
AERO-Project-EU · Jan 25, 2024 · 44a1d4b · 44a1d4b
2 parents 778e850 + 886f5ef
commit 44a1d4b
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/...vm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/SubstrateAMD64RegisterConfig.java b/...vm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/SubstrateAMD64RegisterConfig.java
@@ -69,7 +69,6 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import jdk.graal.compiler.core.common.LIRKind;
 import org.graalvm.nativeimage.Platform;
 
 import com.oracle.svm.core.ReservedRegisters;
@@ -83,6 +82,7 @@
 import com.oracle.svm.core.graal.meta.SubstrateRegisterConfig;
 import com.oracle.svm.core.util.VMError;
 
+import jdk.graal.compiler.core.common.LIRKind;
 import jdk.vm.ci.amd64.AMD64;
 import jdk.vm.ci.amd64.AMD64Kind;
 import jdk.vm.ci.code.CallingConvention;
@@ -154,7 +154,9 @@ public SubstrateAMD64RegisterConfig(ConfigKind config, MetaAccessProvider metaAc
             nativeParamsStackOffset = 4 * target.wordSize;
 
             regs.remove(ReservedRegisters.singleton().getFrameRegister());
-            regs.remove(rbp);
+            if (useBasePointer) {
+                regs.remove(rbp);
+            }
             regs.remove(ReservedRegisters.singleton().getHeapBaseRegister());
             regs.remove(ReservedRegisters.singleton().getThreadRegister());
             allocatableRegs = new RegisterArray(regs);