Adapt JDK-8336768: Allow captureCallState and critical linker options…

… to be combined Closes: #10304
oracle · Dec 13, 2024 · 7979a83 · 7979a83
1 parent ca7e8b3
commit 7979a83
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/...ign/src/com/oracle/svm/core/foreign/Target_jdk_internal_foreign_abi_NativeEntryPoint.java b/...ign/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
@@ -73,6 +76,7 @@ public static Target_jdk_internal_foreign_abi_NativeEntryPoint make(ABIDescripto
     }
 
     @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;
     }