Skip to content

[GR-72993] Fix regression due to fixed register in SubstrateVM AMD64 indirect call #12983

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
graalvmbot merged 1 commit into from
Feb 17, 2026
Merged

[GR-72993] Fix regression due to fixed register in SubstrateVM AMD64 indirect call #12983

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions ...racle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/SubstrateAMD64Backend.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,11 @@ public static class SubstrateAMD64IndirectCallOp extends AMD64Call.IndirectCallO

private final boolean destroysCallerSavedRegisters;
@Temp({REG, OperandFlag.ILLEGAL}) private Value exceptionTemp;

/*
* Make it explicit that this operation overrides a given register (rax or r10).
*/
@Temp({REG}) private Value targetAddressRegister;
private final BiConsumer<CompilationResultBuilder, Integer> offsetRecorder;

@Def({REG}) private Value[] multipleResults;
Expand Down Expand Up @@ -340,6 +345,8 @@ public SubstrateAMD64IndirectCallOp(ResolvedJavaMethod callTarget, Value result,
this.javaFrameAnchorTemp = javaFrameAnchorTemp;
this.destroysCallerSavedRegisters = destroysCallerSavedRegisters;
this.exceptionTemp = exceptionTemp;
this.targetAddress = targetAddress;
this.targetAddressRegister = targetAddress;
this.offsetRecorder = offsetRecorder;
this.multipleResults = multipleResults;
this.callingConventionType = callingConventionType;
Expand Down Expand Up @@ -1083,10 +1090,17 @@ protected void emitDirectCall(DirectCallTargetNode callTarget, Value result, Val

@Override
protected void emitIndirectCall(IndirectCallTargetNode callTarget, Value result, Value[] parameters, Value[] temps, LIRFrameState callState) {
boolean hasHiddenArgument = callTarget instanceof SubstrateIndirectCallTargetNode substrateIndirectCallTargetNode && substrateIndirectCallTargetNode.getHiddenArgument() != null;
boolean isNativeABI = ((SubstrateCallingConventionType) callTarget.callType()).nativeABI();

// The register allocator cannot handle variables at call sites, need a fixed register.
// Do not use RAX for C calls, it contains the number of XMM registers for varargs.
// RAX can also be used for the hidden argument (non-native ABI only).
AllocatableValue targetAddress = AMD64.r10.asValue(FrameAccess.getWordStamp().getLIRKind(getLIRGeneratorTool().getLIRKindTool()));
Register targetAddressRegister = AMD64.rax;
if (hasHiddenArgument || isNativeABI) {
targetAddressRegister = AMD64.r10;
}
AllocatableValue targetAddress = targetAddressRegister.asValue(FrameAccess.getWordStamp().getLIRKind(getLIRGeneratorTool().getLIRKindTool()));
gen.emitMove(targetAddress, operand(callTarget.computedAddress()));
ResolvedJavaMethod targetMethod = callTarget.targetMethod();
vzeroupperBeforeCall((SubstrateAMD64LIRGenerator) getLIRGeneratorTool(), parameters, callState, (SharedMethod) targetMethod);
Expand All @@ -1100,7 +1114,7 @@ protected void emitIndirectCall(IndirectCallTargetNode callTarget, Value result,
}

Value hiddenArgument = Value.ILLEGAL;
if (callTarget instanceof SubstrateIndirectCallTargetNode substrateCallTarget && substrateCallTarget.getHiddenArgument() != null) {
if (hasHiddenArgument) {
// See SubstrateAMD64NodeLIRBuilder#visitInvokeArguments
hiddenArgument = HIDDEN_ARGUMENT_REGISTER.asValue(LIRKind.value(AMD64Kind.QWORD));
}
Expand Down