[GR-64967] Remove "forceJavac" where it was added due to insufficient support from ECJ.

PullRequest: graal/20803

Author: jchalou

substratevm/mx.substratevm/suite.py

@@ -817,8 +817,6 @@
                 ],
             },
             "javaCompliance" : "22+",
-            # GR-51699
-            "forceJavac": True,
             "annotationProcessors": [
                 "compiler:GRAAL_PROCESSOR",
                 "SVM_PROCESSOR",
@@ -863,8 +861,6 @@
                 ],
             },
             "javaCompliance" : "22+",
-            # GR-51699
-            "forceJavac": True,
             "annotationProcessors": [
                 "compiler:GRAAL_PROCESSOR",
                 "SVM_PROCESSOR",

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

@@ -136,10 +136,10 @@ public record TypeAdaptation(List<AssignedLocation> parametersAssignment, Method
         }
 
         public static Result.FullNativeAdaptation adaptToNative(AbiUtils self, List<Adaptation> adaptations, List<ValueNode> originalArguments, NativeEntryPointInfo nep) {
-            originalArguments = Collections.unmodifiableList(originalArguments);
+            List<ValueNode> originalUnmodifiableArguments = Collections.unmodifiableList(originalArguments);
 
             AssignedLocation[] originalAssignment = self.toMemoryAssignment(nep.parametersAssignment(), false);
-            VMError.guarantee(allEqual(adaptations.size(), originalArguments.size(), nep.methodType().parameterCount(), originalAssignment.length));
+            VMError.guarantee(allEqual(adaptations.size(), originalUnmodifiableArguments.size(), nep.methodType().parameterCount(), originalAssignment.length));
 
             Map<Extracted, ValueNode> extractedArguments = new EnumMap<>(Extracted.class);
             List<ValueNode> arguments = new ArrayList<>();
@@ -154,7 +154,7 @@ public static Result.FullNativeAdaptation adaptToNative(AbiUtils self, List<Adap
                     adaptation = NOOP;
                 }
 
-                arguments.addAll(adaptation.apply(originalArguments.get(i), extractedArguments, originalArguments, i, nodesToAppendToGraph::add));
+                arguments.addAll(adaptation.apply(originalUnmodifiableArguments.get(i), extractedArguments, originalUnmodifiableArguments, i, nodesToAppendToGraph::add));
                 assignment.addAll(adaptation.apply(originalAssignment[i]));
                 argumentTypes.addAll(adaptation.apply(nep.methodType().parameterType(i)));
 
@@ -246,7 +246,7 @@ public static Adaptation extract(Extracted as, Class<?> type) {
             return new ExtractSingle(as, type);
         }
 
-        public static Adaptation extractSegmentPair(Extracted as, Class<?> type) {
+        public static Adaptation extractSegmentPair(Extracted as) {
             return new ExtractSegmentPair(as);
         }
 
@@ -324,9 +324,9 @@ public List<ValueNode> apply(ValueNode parameter, Map<Extracted, ValueNode> extr
          * (segments allocated using an Arena), and these have a method `unsafeGetOffset` which
          * straightforwardly returns the raw pointer. <br>
          * However, when `allowHeapAccess` is true (the argument to Linker.Option.critical), one may
-         * pass a {@link HeapMemorySegmentImpl} as well. For reasons detailed in its documentation,
-         * heap segments are represented as an Object + offset pair, where the raw pointer should be
-         * derived from their sum. <br>
+         * pass a {@link jdk.internal.foreign.HeapMemorySegmentImpl} as well. For reasons detailed
+         * in its documentation, heap segments are represented as an Object + offset pair, where the
+         * raw pointer should be derived from their sum. <br>
          * Hence, when `allowHeapAccess` is true,
          * {@link CallArranger.UnboxBindingCalculator#getBindings(Class, MemoryLayout)} passes two
          * arguments for every AddressLayout, the result of `unsafeGetBase` (of type Object) and
@@ -340,6 +340,7 @@ public List<ValueNode> apply(ValueNode parameter, Map<Extracted, ValueNode> extr
          * {@code null} is when Linker.Option.critical(true) is passed. See
          * {@link CallArranger.UnboxBindingCalculator#getBindings(Class, MemoryLayout)}.
          */
+        @SuppressWarnings("javadoc")
         private static final class ComputeAddressFromSegmentPair extends Adaptation {
             private static final ComputeAddressFromSegmentPair SINGLETON = new ComputeAddressFromSegmentPair();
 
@@ -602,7 +603,7 @@ protected List<Adapter.Adaptation> generateAdaptations(NativeEntryPointInfo nep)
             if (nep.allowHeapAccess()) {
                 VMError.guarantee(storages[current] != null && storages[current + 1] == null);
                 // consumes two parameters (i.e. object + offset pair)
-                handleCriticalWithHeapAccess(nep, current + 1, adaptations, Adapter.extractSegmentPair(Adapter.Extracted.CaptureBufferAddress, long.class));
+                handleCriticalWithHeapAccess(nep, current + 1, adaptations, Adapter.extractSegmentPair(Adapter.Extracted.CaptureBufferAddress));
                 current += 2;
             } else {
                 adaptations.set(current, Adapter.extract(Adapter.Extracted.CaptureBufferAddress, long.class));
@@ -898,6 +899,7 @@ public void checkLibrarySupport() {
     @BasedOnJDKClass(jdk.internal.foreign.abi.UpcallLinker.class)
     abstract static class X86_64 extends AbiUtils {
 
+        @Override
         protected abstract CallingSequence makeCallingSequence(MethodType type, FunctionDescriptor desc, boolean forUpcall, LinkerOptions options);
 
         @Override

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

@@ -34,6 +34,7 @@
  * case of the FFM API support is disabled entirely, substitutions in
  * {@link com.oracle.svm.core.jdk.ForeignDisabledSubstitutions} will be used.
  */
+@SuppressWarnings("javadoc")
 public final class ForeignAPIPredicates {
     public static final class Enabled implements BooleanSupplier {
         @Override

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

@@ -53,7 +53,7 @@ static JavaEntryPointInfo make(MethodType mt, Target_jdk_internal_foreign_abi_Up
         return new JavaEntryPointInfo(mt, conv.argRegs(), conv.retRegs(), returnBufferSize);
     }
 
-    static JavaEntryPointInfo make(MethodHandle mh, ABIDescriptor abi, Target_jdk_internal_foreign_abi_UpcallLinker_CallRegs conv,
+    static JavaEntryPointInfo make(MethodHandle mh, @SuppressWarnings("unused") ABIDescriptor abi, Target_jdk_internal_foreign_abi_UpcallLinker_CallRegs conv,
                     boolean needsReturnBuffer, long returnBufferSize) {
         return make(mh.type(), conv, needsReturnBuffer, returnBufferSize);
     }

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

@@ -78,12 +78,13 @@ public static NativeEntryPointInfo make(
                     boolean needsReturnBuffer,
                     int capturedStateMask,
                     boolean needsTransition,
-                    boolean allowHeapAccess) {
+                    boolean allowHeapAccessParam) {
         if ((returnMoves.length > 1) != needsReturnBuffer) {
             throw new AssertionError("Multiple register return, but needsReturnBuffer was false");
         }
         var hasNull = Arrays.stream(argMoves).anyMatch(Objects::isNull);
-        VMError.guarantee(!hasNull || allowHeapAccess, "null VMStorages should only appear with Linker.Option.critical(true).");
+        VMError.guarantee(!hasNull || allowHeapAccessParam, "null VMStorages should only appear with Linker.Option.critical(true).");
+        boolean allowHeapAccess = allowHeapAccessParam;
         if (!hasNull) {
             /*
              * hasNull is only true if this entry point's FunctionDescriptor contains an

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

@@ -66,6 +66,7 @@
  * succeed. See
  * {@link com.oracle.svm.core.jdk.Target_java_lang_ClassLoader#loadLibrary(java.lang.Class, java.lang.String)}
  */
+@SuppressWarnings("javadoc")
 @TargetClass(className = "java.lang.foreign.SymbolLookup", onlyWith = ForeignAPIPredicates.Enabled.class)
 public final class Target_java_lang_foreign_SymbolLookup {
 

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

@@ -37,6 +37,7 @@
  */
 @TargetClass(className = "jdk.internal.foreign.SystemLookup", onlyWith = ForeignAPIPredicates.Enabled.class)
 public final class Target_jdk_internal_foreign_SystemLookup {
+    @SuppressWarnings("static-method")
     @Substitute
     public Optional<MemorySegment> find(String name) {
         return RuntimeSystemLookup.INSTANCE.find(name);

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

@@ -95,6 +95,7 @@ public MemorySegment makeStub(MethodHandle target, Arena arena) {
 @TargetClass(value = SysVx64Linker.class, onlyWith = ForeignAPIPredicates.FunctionCallsSupported.class)
 final class Target_jdk_internal_foreign_abi_x64_sysv_SysVx64Linker {
 
+    @SuppressWarnings("static-method")
     @Substitute
     UpcallStubFactory arrangeUpcall(MethodType targetType, FunctionDescriptor function, LinkerOptions options) {
         return new UpcallStubFactoryDecorator(jdk.internal.foreign.abi.x64.sysv.CallArranger.arrangeUpcall(targetType, function, options), function, options);
@@ -104,6 +105,7 @@ UpcallStubFactory arrangeUpcall(MethodType targetType, FunctionDescriptor functi
 @TargetClass(value = Windowsx64Linker.class, onlyWith = ForeignAPIPredicates.FunctionCallsSupported.class)
 final class Target_jdk_internal_foreign_abi_x64_windows_Windowsx64Linker {
 
+    @SuppressWarnings("static-method")
     @Substitute
     UpcallStubFactory arrangeUpcall(MethodType targetType, FunctionDescriptor function, LinkerOptions options) {
         return new UpcallStubFactoryDecorator(jdk.internal.foreign.abi.x64.windows.CallArranger.arrangeUpcall(targetType, function, options), function, options);
@@ -113,6 +115,7 @@ UpcallStubFactory arrangeUpcall(MethodType targetType, FunctionDescriptor functi
 @TargetClass(value = MacOsAArch64Linker.class, onlyWith = ForeignAPIPredicates.FunctionCallsSupported.class)
 final class Target_jdk_internal_foreign_abi_aarch64_macos_MacOsAArch64Linker {
 
+    @SuppressWarnings("static-method")
     @Substitute
     UpcallStubFactory arrangeUpcall(MethodType targetType, FunctionDescriptor function, LinkerOptions options) {
         return new UpcallStubFactoryDecorator(jdk.internal.foreign.abi.aarch64.CallArranger.MACOS.arrangeUpcall(targetType, function, options), function, options);
@@ -122,6 +125,7 @@ UpcallStubFactory arrangeUpcall(MethodType targetType, FunctionDescriptor functi
 @TargetClass(value = LinuxAArch64Linker.class, onlyWith = ForeignAPIPredicates.FunctionCallsSupported.class)
 final class Target_jdk_internal_foreign_abi_aarch64_linux_LinuxAArch64Linker {
 
+    @SuppressWarnings("static-method")
     @Substitute
     UpcallStubFactory arrangeUpcall(MethodType targetType, FunctionDescriptor function, LinkerOptions options) {
         return new UpcallStubFactoryDecorator(jdk.internal.foreign.abi.aarch64.CallArranger.LINUX.arrangeUpcall(targetType, function, options), function, options);

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

@@ -38,6 +38,7 @@
  * Packs the address of a {@link com.oracle.svm.hosted.foreign.DowncallStub} with some extra
  * information.
  */
+@SuppressWarnings("javadoc")
 @TargetClass(className = "jdk.internal.foreign.abi.NativeEntryPoint", onlyWith = ForeignAPIPredicates.FunctionCallsSupported.class)
 @Substitute
 public final class Target_jdk_internal_foreign_abi_NativeEntryPoint {
@@ -59,7 +60,7 @@ public static Target_jdk_internal_foreign_abi_NativeEntryPoint make(ABIDescripto
                     boolean needsReturnBuffer,
                     int capturedStateMask,
                     boolean needsTransition,
-                    boolean usingAddressPairs) {
+                    @SuppressWarnings("unused") boolean usingAddressPairs) {
         /*
          * A VMStorage may be null only when the Linker.Option.critical(allowHeapAccess=true) option
          * is passed. (see

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

@@ -83,6 +83,7 @@
  *
  * @noinspection CaughtExceptionImmediatelyRethrown
  */
+@SuppressWarnings("javadoc")
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+15/src/java.base/share/classes/jdk/internal/misc/X-ScopedMemoryAccess-bin.java.template")
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+13/src/java.base/share/classes/jdk/internal/misc/X-ScopedMemoryAccess.java.template")
 @TargetClass(className = "jdk.internal.misc.ScopedMemoryAccess", onlyWith = ForeignAPIPredicates.Enabled.class)