Move WINDOWS_BASE to InternalPlatform.

peter-hofer · peter-hofer · commit ec9177f71f72 · 2025-06-27T19:31:15.000+02:00
diff --git a/sdk/src/org.graalvm.nativeimage/snapshot.sigtest b/sdk/src/org.graalvm.nativeimage/snapshot.sigtest
@@ -421,14 +421,14 @@ CLSS public abstract interface static org.graalvm.nativeimage.Platform$RISCV64
 intf org.graalvm.nativeimage.Platform
 meth public java.lang.String getArchitecture()
 
-CLSS public abstract interface static org.graalvm.nativeimage.Platform$WINDOWS_BASE
+CLSS public abstract interface static org.graalvm.nativeimage.impl.InternalPlatform$WINDOWS_BASE
  outer org.graalvm.nativeimage.Platform
 intf org.graalvm.nativeimage.impl.InternalPlatform$NATIVE_ONLY
 meth public java.lang.String getOS()
 
 CLSS public abstract interface static org.graalvm.nativeimage.Platform$WINDOWS
  outer org.graalvm.nativeimage.Platform
-intf org.graalvm.nativeimage.Platform$WINDOWS_BASE
+intf org.graalvm.nativeimage.impl.InternalPlatform$WINDOWS_BASE
 intf org.graalvm.nativeimage.impl.InternalPlatform$PLATFORM_JNI
 
 CLSS public final static org.graalvm.nativeimage.Platform$WINDOWS_AARCH64
diff --git a/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/Platform.java b/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/Platform.java
@@ -242,29 +242,12 @@ default String getOS() {
         }
     }
 
-    /**
-     * Supported operating system: Windows, without registering OS-specific providers or making use
-     * of (or support for) JNI libraries.
-     *
-     * @since 25.0
-     */
-    interface WINDOWS_BASE extends InternalPlatform.NATIVE_ONLY {
-        /**
-         * Returns string representing WINDOWS OS.
-         *
-         * @since 21.0
-         */
-        default String getOS() {
-            return "windows";
-        }
-    }
-
     /**
      * Supported operating system: Windows.
      *
      * @since 19.0
      */
-    interface WINDOWS extends WINDOWS_BASE, InternalPlatform.PLATFORM_JNI {
+    interface WINDOWS extends InternalPlatform.WINDOWS_BASE, InternalPlatform.PLATFORM_JNI {
     }
 
     /**
diff --git a/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/InternalPlatform.java b/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/InternalPlatform.java
@@ -60,4 +60,21 @@ interface PLATFORM_JNI extends Platform {
     interface NATIVE_ONLY extends Platform {
 
     }
+
+    /**
+     * Supported operating system: Windows, without registering OS-specific providers or making use
+     * of (or support for) JNI libraries.
+     *
+     * @since 25.0
+     */
+    interface WINDOWS_BASE extends NATIVE_ONLY {
+        /**
+         * Returns string representing WINDOWS OS.
+         *
+         * @since 21.0
+         */
+        default String getOS() {
+            return "windows";
+        }
+    }
 }
diff --git a/substratevm/src/com.oracle.svm.agent/src/com/oracle/svm/agent/NativeImageAgent.java b/substratevm/src/com.oracle.svm.agent/src/com/oracle/svm/agent/NativeImageAgent.java
@@ -514,7 +514,7 @@ private static String[] getClasspathEntries(JvmtiEnv jvmti) {
         if (sep == null) {
             if (Platform.includedIn(Platform.LINUX.class) || Platform.includedIn(Platform.DARWIN.class)) {
                 sep = ":";
-            } else if (Platform.includedIn(Platform.WINDOWS_BASE.class)) {
+            } else if (Platform.includedIn(Platform.WINDOWS.class)) {
                 sep = "[:;]";
             } else {
                 warn("Running on unknown platform. Could not process classpath.");
diff --git a/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/SubstrateAArch64RegisterConfig.java b/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/SubstrateAArch64RegisterConfig.java
@@ -72,6 +72,7 @@
 import java.util.Set;
 
 import org.graalvm.nativeimage.Platform;
+import org.graalvm.nativeimage.impl.InternalPlatform;
 
 import com.oracle.svm.core.ReservedRegisters;
 import com.oracle.svm.core.aarch64.SubstrateAArch64MacroAssembler;
@@ -163,7 +164,7 @@ public SubstrateAArch64RegisterConfig(ConfigKind config, MetaAccessProvider meta
          *
          * https://developer.android.com/ndk/guides/abis#arm64-v8a
          */
-        if (Platform.includedIn(Platform.DARWIN.class) || Platform.includedIn(Platform.WINDOWS_BASE.class) || Platform.includedIn(Platform.ANDROID.class)) {
+        if (Platform.includedIn(Platform.DARWIN.class) || Platform.includedIn(InternalPlatform.WINDOWS_BASE.class) || Platform.includedIn(Platform.ANDROID.class)) {
             regs.remove(r18);
         }
         allocatableRegs = List.copyOf(regs);
diff --git a/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/AMD64InterpreterStubs.java b/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/AMD64InterpreterStubs.java
@@ -34,6 +34,7 @@
 import org.graalvm.nativeimage.c.struct.RawField;
 import org.graalvm.nativeimage.c.struct.RawStructure;
 import org.graalvm.nativeimage.c.struct.SizeOf;
+import org.graalvm.nativeimage.impl.InternalPlatform;
 import org.graalvm.word.Pointer;
 import org.graalvm.word.PointerBase;
 
@@ -119,7 +120,7 @@ public void enter(CompilationResultBuilder crb) {
                 masm.movq(createAddress(offsetAbiFpArg6()), fps.get(6));
                 masm.movq(createAddress(offsetAbiFpArg7()), fps.get(7));
             } else {
-                assert Platform.includedIn(Platform.WINDOWS_BASE.class);
+                assert Platform.includedIn(InternalPlatform.WINDOWS_BASE.class);
                 VMError.guarantee(fps.size() == 4);
             }
 
@@ -558,7 +559,7 @@ public long setGpArgumentAt(AllocatableValue ccArg, Pointer data, int pos, long
 
         private static int upperFpEnd() {
             /* only 4 floating point regs on Windows, 8 otherwise */
-            return Platform.includedIn(Platform.WINDOWS_BASE.class) ? 3 : 7;
+            return Platform.includedIn(InternalPlatform.WINDOWS_BASE.class) ? 3 : 7;
         }
 
         @Override
diff --git a/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/SubstrateAMD64RegisterConfig.java b/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/SubstrateAMD64RegisterConfig.java
@@ -73,6 +73,7 @@
 import java.util.Set;
 
 import org.graalvm.nativeimage.Platform;
+import org.graalvm.nativeimage.impl.InternalPlatform;
 
 import com.oracle.svm.core.ReservedRegisters;
 import com.oracle.svm.core.SubstrateUtil;
@@ -146,7 +147,7 @@ public SubstrateAMD64RegisterConfig(ConfigKind config, MetaAccessProvider metaAc
             }
         }
 
-        if (Platform.includedIn(Platform.WINDOWS_BASE.class)) {
+        if (Platform.includedIn(InternalPlatform.WINDOWS_BASE.class)) {
             // This is the Windows 64-bit ABI for parameters.
             // Note that float parameters also "consume" a general register and vice versa in the
             // native ABI.
@@ -195,7 +196,7 @@ public SubstrateAMD64RegisterConfig(ConfigKind config, MetaAccessProvider metaAc
                  * rbp must be last in the list, so that it gets the location closest to the saved
                  * return address.
                  */
-                if (Platform.includedIn(Platform.WINDOWS_BASE.class)) {
+                if (Platform.includedIn(InternalPlatform.WINDOWS_BASE.class)) {
                     calleeSaveRegisters = List.of(rbx, rdi, rsi, r12, r13, r14, r15, rbp,
                                     xmm6, xmm7, xmm8, xmm9, xmm10, xmm11, xmm12, xmm13, xmm14, xmm15);
                 } else {
@@ -321,7 +322,7 @@ public CallingConvention getCallingConvention(Type t, JavaType returnType, JavaT
                 JavaKind kind = ObjectLayout.getCallSignatureKind(isEntryPoint, parameterTypes[i], metaAccess, target);
                 kinds[i] = kind;
 
-                if (type.nativeABI() && Platform.includedIn(Platform.WINDOWS_BASE.class)) {
+                if (type.nativeABI() && Platform.includedIn(InternalPlatform.WINDOWS_BASE.class)) {
                     // Strictly positional: float parameters consume a general register and vice
                     // versa
                     currentGeneral = i;
diff --git a/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/headers/WindowsDirectives.java b/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/headers/WindowsDirectives.java
@@ -30,6 +30,7 @@
 
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.c.CContext;
+import org.graalvm.nativeimage.impl.InternalPlatform;
 
 import com.oracle.svm.core.util.VMError;
 
@@ -48,12 +49,12 @@ public class WindowsDirectives implements CContext.Directives {
 
     @Override
     public boolean isInConfiguration() {
-        return Platform.includedIn(Platform.WINDOWS_BASE.class);
+        return Platform.includedIn(InternalPlatform.WINDOWS_BASE.class);
     }
 
     @Override
     public List<String> getHeaderFiles() {
-        if (Platform.includedIn(Platform.WINDOWS_BASE.class)) {
+        if (Platform.includedIn(InternalPlatform.WINDOWS_BASE.class)) {
             return new ArrayList<>(Arrays.asList(windowsLibs));
         } else {
             throw VMError.shouldNotReachHere("Unsupported OS");
diff --git a/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/headers/package-info.java b/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/headers/package-info.java
@@ -23,8 +23,8 @@
  * questions.
  */
 
-@Platforms(Platform.WINDOWS_BASE.class)
+@Platforms(InternalPlatform.WINDOWS_BASE.class)
 package com.oracle.svm.core.windows.headers;
 
-import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
+import org.graalvm.nativeimage.impl.InternalPlatform;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/DumpRuntimeCompilationOnSignalFeature.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/DumpRuntimeCompilationOnSignalFeature.java
@@ -26,7 +26,7 @@
 package com.oracle.svm.core;
 
 import org.graalvm.nativeimage.Platform;
-import org.graalvm.nativeimage.Platform.WINDOWS_BASE;
+import org.graalvm.nativeimage.impl.InternalPlatform.WINDOWS_BASE;
 
 import com.oracle.svm.core.feature.AutomaticallyRegisteredFeature;
 import com.oracle.svm.core.feature.InternalFeature;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SigQuitFeature.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SigQuitFeature.java
@@ -26,7 +26,7 @@
 package com.oracle.svm.core;
 
 import org.graalvm.nativeimage.Platform;
-import org.graalvm.nativeimage.Platform.WINDOWS_BASE;
+import org.graalvm.nativeimage.impl.InternalPlatform.WINDOWS_BASE;
 
 import com.oracle.svm.core.attach.AttachApiSupport;
 import com.oracle.svm.core.feature.AutomaticallyRegisteredFeature;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateOptions.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateOptions.java
@@ -47,6 +47,7 @@
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platform.HOSTED_ONLY;
 import org.graalvm.nativeimage.Platforms;
+import org.graalvm.nativeimage.impl.InternalPlatform;
 
 import com.oracle.svm.core.c.libc.LibCBase;
 import com.oracle.svm.core.c.libc.MuslLibC;
@@ -1223,7 +1224,7 @@ protected void onValueUpdate(EconomicMap<OptionKey<?>, Object> values, Integer o
         /** Use {@link SubstrateOptions#hasDumpRuntimeCompiledMethodsSupport()} instead. */
         @Option(help = "Dump the instructions of runtime compiled methods in temporary files.") //
         public static final RuntimeOptionKey<Boolean> DumpRuntimeCompiledMethods = new RuntimeOptionKey<>(false, key -> {
-            if (key.hasBeenSet() && Platform.includedIn(Platform.WINDOWS_BASE.class)) {
+            if (key.hasBeenSet() && Platform.includedIn(InternalPlatform.WINDOWS_BASE.class)) {
                 throw UserError.invalidOptionValue(key, key.getValue(), "Dumping runtime compiled code is not supported on Windows.");
             }
         });
@@ -1557,7 +1558,7 @@ private static void validateRelativeCodePointers(HostedOptionKey<Boolean> option
     }
 
     public static boolean hasDumpRuntimeCompiledMethodsSupport() {
-        return !Platform.includedIn(Platform.WINDOWS_BASE.class) && ConcealedOptions.DumpRuntimeCompiledMethods.getValue();
+        return !Platform.includedIn(InternalPlatform.WINDOWS_BASE.class) && ConcealedOptions.DumpRuntimeCompiledMethods.getValue();
     }
 
     @Option(help = "file:doc-files/TrackDynamicAccessHelp.txt")//
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/VMInspectionOptions.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/VMInspectionOptions.java
@@ -31,8 +31,8 @@
 
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.nativeimage.Platform;
-import org.graalvm.nativeimage.Platform.WINDOWS_BASE;
 import org.graalvm.nativeimage.Platforms;
+import org.graalvm.nativeimage.impl.InternalPlatform.WINDOWS_BASE;
 
 import com.oracle.svm.core.heap.dump.HeapDumping;
 import com.oracle.svm.core.jdk.management.ManagementAgentModule;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/PhysicalMemory.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/PhysicalMemory.java
@@ -29,6 +29,7 @@
 
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
+import org.graalvm.nativeimage.impl.InternalPlatform;
 import org.graalvm.word.UnsignedWord;
 
 import com.oracle.svm.core.IsolateArgumentParser;
@@ -102,7 +103,7 @@ public static void initialize() {
     /** Returns the amount of used physical memory in bytes, or -1 if not supported. */
     public static long usedSize() {
         // Windows, macOS, and containerized Linux use the OS bean.
-        if (Platform.includedIn(Platform.WINDOWS_BASE.class) ||
+        if (Platform.includedIn(InternalPlatform.WINDOWS_BASE.class) ||
                         Platform.includedIn(Platform.MACOS.class) ||
                         (Container.singleton().isContainerized() && Container.singleton().getMemoryLimitInBytes() > 0)) {
             OperatingSystemMXBean osBean = (com.sun.management.OperatingSystemMXBean) ManagementFactory.getOperatingSystemMXBean();
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/FileSystemProviderSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/FileSystemProviderSupport.java
@@ -34,6 +34,7 @@
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.nativeimage.hosted.FieldValueTransformer;
+import org.graalvm.nativeimage.impl.InternalPlatform;
 
 import com.oracle.svm.core.annotate.Alias;
 import com.oracle.svm.core.annotate.Inject;
@@ -422,7 +423,7 @@ final class Target_java_io_FileSystem {
 class UserDirAccessors {
     @SuppressWarnings("unused")
     static String getUserDir(Target_java_io_FileSystem that) {
-        if (Platform.includedIn(Platform.WINDOWS_BASE.class)) {
+        if (Platform.includedIn(InternalPlatform.WINDOWS_BASE.class)) {
             /*
              * Note that on Windows, we normalize the property value (JDK-8198997) and do not use
              * the `StaticProperty.userDir()` like the rest (JDK-8066709).
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JNIRegistrationUtil.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JNIRegistrationUtil.java
@@ -38,6 +38,7 @@
 import org.graalvm.nativeimage.hosted.Feature.DuringAnalysisAccess;
 import org.graalvm.nativeimage.hosted.Feature.FeatureAccess;
 import org.graalvm.nativeimage.hosted.RuntimeJNIAccess;
+import org.graalvm.nativeimage.impl.InternalPlatform;
 import org.graalvm.nativeimage.impl.RuntimeClassInitializationSupport;
 
 import com.oracle.svm.core.util.ConcurrentIdentityHashMap;
@@ -65,7 +66,7 @@ protected static boolean isWindows() {
         if (Platform.includedIn(Platform.WINDOWS.class)) {
             return true;
         }
-        assert !Platform.includedIn(Platform.WINDOWS_BASE.class) : "Should never be called when targeting a non-JNI platform";
+        assert !Platform.includedIn(InternalPlatform.WINDOWS_BASE.class) : "Should never be called when targeting a non-JNI platform";
         return false;
     }
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SecuritySubstitutions.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SecuritySubstitutions.java
@@ -162,7 +162,7 @@ public Object transform(Object receiver, Object originalValue) {
     }
 }
 
-@Platforms(Platform.WINDOWS_BASE.class)
+@Platforms(InternalPlatform.WINDOWS_BASE.class)
 @TargetClass(value = java.security.Provider.class)
 final class Target_java_security_Provider_Windows {
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/management/ManagementSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/management/ManagementSupport.java
@@ -308,7 +308,7 @@ private static Class<? extends PlatformManagedObject> getFlightRecorderMXBeanCla
     @Platforms(Platform.HOSTED_ONLY.class)
     private static Class<? extends PlatformManagedObject> getOsMXBeanInterface() {
         if (Platform.includedIn(InternalPlatform.PLATFORM_JNI.class)) {
-            return Platform.includedIn(Platform.WINDOWS_BASE.class)
+            return Platform.includedIn(InternalPlatform.WINDOWS_BASE.class)
                             ? com.sun.management.OperatingSystemMXBean.class
                             : com.sun.management.UnixOperatingSystemMXBean.class;
         }
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/VMFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/VMFeature.java
@@ -28,9 +28,9 @@
 import java.util.Locale;
 import java.util.stream.Collectors;
 
-import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
+import org.graalvm.nativeimage.impl.InternalPlatform;
 import org.graalvm.word.PointerBase;
 
 import com.oracle.graal.pointsto.reports.ReportUtils;
@@ -45,6 +45,8 @@
 import com.oracle.svm.hosted.c.NativeLibraries;
 import com.oracle.svm.hosted.c.codegen.CCompilerInvoker;
 
+import jdk.graal.compiler.word.Word;
+
 @AutomaticallyRegisteredFeature
 public class VMFeature implements InternalFeature {
 
@@ -113,7 +115,7 @@ public void afterAnalysis(AfterAnalysisAccess access) {
             });
         }
 
-        if (!Platform.includedIn(Platform.WINDOWS_BASE.class)) {
+        if (!Platform.includedIn(InternalPlatform.WINDOWS_BASE.class)) {
             CGlobalData<PointerBase> isStaticBinaryMarker = CGlobalDataFactory.createWord(Word.unsigned(SubstrateOptions.StaticExecutable.getValue() ? 1 : 0), STATIC_BINARY_MARKER_SYMBOL_NAME);
             CGlobalDataFeature.singleton().registerWithGlobalHiddenSymbol(isStaticBinaryMarker);
         }
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/NativeLibraries.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/NativeLibraries.java
@@ -297,7 +297,7 @@ public TargetDescription getTarget() {
     }
 
     private static String getStaticLibraryName(String libraryName) {
-        boolean targetWindows = Platform.includedIn(Platform.WINDOWS_BASE.class);
+        boolean targetWindows = Platform.includedIn(InternalPlatform.WINDOWS_BASE.class);
         String prefix = targetWindows ? "" : "lib";
         String suffix = targetWindows ? ".lib" : ".a";
         return prefix + libraryName + suffix;
@@ -495,7 +495,7 @@ private static Path getStaticLibraryPath(Map<Path, Path> allStaticLibs, String s
 
     private Map<Path, Path> getAllStaticLibs() {
         Map<Path, Path> allStaticLibs = new LinkedHashMap<>();
-        String libSuffix = Platform.includedIn(Platform.WINDOWS_BASE.class) ? ".lib" : ".a";
+        String libSuffix = Platform.includedIn(InternalPlatform.WINDOWS_BASE.class) ? ".lib" : ".a";
         for (String libraryPath : getLibraryPaths()) {
             try (Stream<Path> paths = Files.list(Paths.get(libraryPath))) {
                 paths.filter(Files::isRegularFile)
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/codegen/QueryCodeWriter.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/codegen/QueryCodeWriter.java
@@ -34,6 +34,7 @@
 
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.c.CContext;
+import org.graalvm.nativeimage.impl.InternalPlatform;
 
 import com.oracle.svm.hosted.c.DirectivesExtension;
 import com.oracle.svm.hosted.c.info.ConstantInfo;
@@ -72,7 +73,7 @@ public QueryCodeWriter(Path tempDirectory) {
         writer = new CSourceCodeWriter(tempDirectory);
         elementForLineNumber = new ArrayList<>();
 
-        boolean isWindows = Platform.includedIn(Platform.WINDOWS_BASE.class);
+        boolean isWindows = Platform.includedIn(InternalPlatform.WINDOWS_BASE.class);
         String formatL64 = "%" + (isWindows ? "ll" : "l");
         formatSInt64 = formatL64 + "d";
         formatUInt64 = formatL64 + "u";
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageViaCC.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageViaCC.java
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/WindowsUnwindInfoFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/WindowsUnwindInfoFeature.java
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JDKInitializationFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JDKInitializationFeature.java
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jni/JNIJavaCallVariantWrapperMethod.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jni/JNIJavaCallVariantWrapperMethod.java
diff --git a/substratevm/src/com.oracle.svm.truffle.nfi/src/com/oracle/svm/truffle/nfi/NFIInitialization.java b/substratevm/src/com.oracle.svm.truffle.nfi/src/com/oracle/svm/truffle/nfi/NFIInitialization.java

Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,7 @@`
`72`	`72`	`import java.util.Set;`
`73`	`73`
`74`	`74`	`import org.graalvm.nativeimage.Platform;`
	`75`	`+import org.graalvm.nativeimage.impl.InternalPlatform;`
`75`	`76`
`76`	`77`	`import com.oracle.svm.core.ReservedRegisters;`
`77`	`78`	`import com.oracle.svm.core.aarch64.SubstrateAArch64MacroAssembler;`
`@@ -163,7 +164,7 @@ public SubstrateAArch64RegisterConfig(ConfigKind config, MetaAccessProvider meta`
`163`	`164`	`*`
`164`	`165`	`* https://developer.android.com/ndk/guides/abis#arm64-v8a`
`165`	`166`	`*/`
`166`		`- if (Platform.includedIn(Platform.DARWIN.class) \|\| Platform.includedIn(Platform.WINDOWS_BASE.class) \|\| Platform.includedIn(Platform.ANDROID.class)) {`
	`167`	`+ if (Platform.includedIn(Platform.DARWIN.class) \|\| Platform.includedIn(InternalPlatform.WINDOWS_BASE.class) \|\| Platform.includedIn(Platform.ANDROID.class)) {`
`167`	`168`	`regs.remove(r18);`
`168`	`169`	`}`
`169`	`170`	`allocatableRegs = List.copyOf(regs);`