Adapt JDK-8336768: Allow captureCallState and critical linker options to be combined

Closes: #10304

Author: zakkak

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

@@ -649,7 +649,7 @@ public NativeEntryPointInfo makeNativeEntrypoint(FunctionDescriptor desc, Linker
 
             // From NativeEntrypoint.make
             return NativeEntryPointInfo.make(argMoves, returnMoves, boundaryType, needsReturnBuffer, callingSequence.capturedStateMask(), callingSequence.needsTransition(),
-                            optionSet.allowsHeapAccess());
+                            callingSequence.usingAddressPairs(), optionSet.allowsHeapAccess());
         }
 
         @Override

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

@@ -55,10 +55,11 @@ public final class NativeEntryPointInfo {
     private final boolean needsReturnBuffer;
     private final boolean capturesState;
     private final boolean needsTransition;
+    private final boolean usingAddressPairs;
     private final boolean allowHeapAccess;
 
     private NativeEntryPointInfo(MethodType methodType, VMStorage[] cc, VMStorage[] returnBuffering, boolean needsReturnBuffer, boolean capturesState, boolean needsTransition,
-                    boolean allowHeapAccess) {
+                    boolean usingAddressPairs, boolean allowHeapAccess) {
         assert methodType.parameterCount() == cc.length;
         assert needsReturnBuffer == (returnBuffering.length > 1);
         // when no transition, allowHeapAccess is unused, so it must be set to false
@@ -69,6 +70,7 @@ private NativeEntryPointInfo(MethodType methodType, VMStorage[] cc, VMStorage[]
         this.needsReturnBuffer = needsReturnBuffer;
         this.capturesState = capturesState;
         this.needsTransition = needsTransition;
+        this.usingAddressPairs = usingAddressPairs;
         this.allowHeapAccess = allowHeapAccess;
     }
 
@@ -78,6 +80,7 @@ public static NativeEntryPointInfo make(
                     boolean needsReturnBuffer,
                     int capturedStateMask,
                     boolean needsTransition,
+                    boolean usingAddressPairs,
                     boolean allowHeapAccess) {
         if ((returnMoves.length > 1) != needsReturnBuffer) {
             throw new AssertionError("Multiple register return, but needsReturnBuffer was false");
@@ -99,7 +102,7 @@ public static NativeEntryPointInfo make(
              */
             allowHeapAccess = false;
         }
-        return new NativeEntryPointInfo(methodType, argMoves, returnMoves, needsReturnBuffer, capturedStateMask != 0, needsTransition, allowHeapAccess);
+        return new NativeEntryPointInfo(methodType, argMoves, returnMoves, needsReturnBuffer, capturedStateMask != 0, needsTransition, usingAddressPairs, allowHeapAccess);
     }
 
     public static Target_jdk_internal_foreign_abi_NativeEntryPoint makeEntryPoint(
@@ -109,8 +112,9 @@ public static Target_jdk_internal_foreign_abi_NativeEntryPoint makeEntryPoint(
                     boolean needsReturnBuffer,
                     int capturedStateMask,
                     boolean needsTransition,
+                    boolean usingAddressPairs,
                     boolean allowHeapAccess) {
-        var info = make(argMoves, returnMoves, methodType, needsReturnBuffer, capturedStateMask, needsTransition, allowHeapAccess);
+        var info = make(argMoves, returnMoves, methodType, needsReturnBuffer, capturedStateMask, needsTransition, usingAddressPairs, allowHeapAccess);
         long addr = ForeignFunctionsRuntime.singleton().getDowncallStubPointer(info).rawValue();
         return new Target_jdk_internal_foreign_abi_NativeEntryPoint(info.methodType(), addr, capturedStateMask);
     }
@@ -153,13 +157,13 @@ public boolean equals(Object o) {
             return false;
         }
         NativeEntryPointInfo that = (NativeEntryPointInfo) o;
-        return capturesState == that.capturesState && needsTransition == that.needsTransition && needsReturnBuffer == that.needsReturnBuffer && allowHeapAccess == that.allowHeapAccess &&
+        return capturesState == that.capturesState && needsTransition == that.needsTransition && usingAddressPairs == that.usingAddressPairs && needsReturnBuffer == that.needsReturnBuffer && allowHeapAccess == that.allowHeapAccess &&
                         Objects.equals(methodType, that.methodType) &&
                         Arrays.equals(parameterAssignments, that.parameterAssignments) && Arrays.equals(returnBuffering, that.returnBuffering);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(methodType, needsReturnBuffer, capturesState, needsTransition, allowHeapAccess, Arrays.hashCode(parameterAssignments), Arrays.hashCode(returnBuffering));
+        return Objects.hash(methodType, needsReturnBuffer, capturesState, needsTransition, usingAddressPairs, allowHeapAccess, Arrays.hashCode(parameterAssignments), Arrays.hashCode(returnBuffering));
     }
 }

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

@@ -31,6 +31,7 @@
 import com.oracle.svm.core.annotate.Substitute;
 import com.oracle.svm.core.annotate.TargetClass;
 
+import com.oracle.svm.core.util.BasedOnJDKFile;
 import jdk.internal.foreign.abi.ABIDescriptor;
 import jdk.internal.foreign.abi.VMStorage;
 
@@ -53,12 +54,14 @@ public final class Target_jdk_internal_foreign_abi_NativeEntryPoint {
     }
 
     @Substitute
+    @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+27/src/java.base/share/classes/jdk/internal/foreign/abi/NativeEntryPoint.java#L58-L82")
     public static Target_jdk_internal_foreign_abi_NativeEntryPoint make(ABIDescriptor abi,
                     VMStorage[] argMoves, VMStorage[] returnMoves,
                     MethodType methodType,
                     boolean needsReturnBuffer,
                     int capturedStateMask,
-                    boolean needsTransition) {
+                    boolean needsTransition,
+                    boolean usingAddressPairs) {
         /*
          * A VMStorage may be null only when the Linker.Option.critical(allowHeapAccess=true) option
          * is passed. (see
@@ -69,10 +72,11 @@ public static Target_jdk_internal_foreign_abi_NativeEntryPoint make(ABIDescripto
          * construction in the NativeEntryPointInfo.make function.
          */
         boolean allowHeapAccess = Arrays.stream(argMoves).anyMatch(Objects::isNull);
-        return NativeEntryPointInfo.makeEntryPoint(abi, argMoves, returnMoves, methodType, needsReturnBuffer, capturedStateMask, needsTransition, allowHeapAccess);
+        return NativeEntryPointInfo.makeEntryPoint(abi, argMoves, returnMoves, methodType, needsReturnBuffer, capturedStateMask, needsTransition, usingAddressPairs, allowHeapAccess);
     }
 
     @Substitute
+    @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+27/src/java.base/share/classes/jdk/internal/foreign/abi/NativeEntryPoint.java#L120-L122")
     public MethodType type() {
         return methodType;
     }