Skip to content

Commit 7979a83

Browse files
committed
Adapt JDK-8336768: Allow captureCallState and critical linker options to be combined
Closes: #10304
1 parent ca7e8b3 commit 7979a83

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

substratevm/src/com.oracle.svm.core.foreign/src/com/oracle/svm/core/foreign/Target_jdk_internal_foreign_abi_NativeEntryPoint.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import com.oracle.svm.core.annotate.Substitute;
3232
import com.oracle.svm.core.annotate.TargetClass;
3333

34+
import com.oracle.svm.core.util.BasedOnJDKFile;
3435
import jdk.internal.foreign.abi.ABIDescriptor;
3536
import jdk.internal.foreign.abi.VMStorage;
3637

@@ -53,12 +54,14 @@ public final class Target_jdk_internal_foreign_abi_NativeEntryPoint {
5354
}
5455

5556
@Substitute
57+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+27/src/java.base/share/classes/jdk/internal/foreign/abi/NativeEntryPoint.java#L58-L82")
5658
public static Target_jdk_internal_foreign_abi_NativeEntryPoint make(ABIDescriptor abi,
5759
VMStorage[] argMoves, VMStorage[] returnMoves,
5860
MethodType methodType,
5961
boolean needsReturnBuffer,
6062
int capturedStateMask,
61-
boolean needsTransition) {
63+
boolean needsTransition,
64+
boolean usingAddressPairs) {
6265
/*
6366
* A VMStorage may be null only when the Linker.Option.critical(allowHeapAccess=true) option
6467
* is passed. (see
@@ -73,6 +76,7 @@ public static Target_jdk_internal_foreign_abi_NativeEntryPoint make(ABIDescripto
7376
}
7477

7578
@Substitute
79+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+27/src/java.base/share/classes/jdk/internal/foreign/abi/NativeEntryPoint.java#L120-L122")
7680
public MethodType type() {
7781
return methodType;
7882
}

0 commit comments

Comments
 (0)