[GR-64956] Introduce WINDOWS_BASE platform without JNI or registering providers.

PullRequest: graal/20872

Author: peter-hofer

sdk/src/org.graalvm.nativeimage/snapshot.sigtest

@@ -421,12 +421,16 @@ 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
+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
-intf org.graalvm.nativeimage.impl.InternalPlatform$PLATFORM_JNI
 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.impl.InternalPlatform$WINDOWS_BASE
+intf org.graalvm.nativeimage.impl.InternalPlatform$PLATFORM_JNI
+
 CLSS public final static org.graalvm.nativeimage.Platform$WINDOWS_AARCH64
  outer org.graalvm.nativeimage.Platform
 cons public init()

sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/Platform.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -247,16 +247,7 @@ default String getOS() {
      *
      * @since 19.0
      */
-    interface WINDOWS extends InternalPlatform.PLATFORM_JNI, InternalPlatform.NATIVE_ONLY {
-
-        /**
-         * Returns string representing WINDOWS OS.
-         *
-         * @since 21.0
-         */
-        default String getOS() {
-            return "windows";
-        }
+    interface WINDOWS extends InternalPlatform.WINDOWS_BASE, InternalPlatform.PLATFORM_JNI {
     }
 
     /**

sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/InternalPlatform.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -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";
+        }
+    }
 }

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.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);

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.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.class) ? 3 : 7;
+            return Platform.includedIn(InternalPlatform.WINDOWS_BASE.class) ? 3 : 7;
         }
 
         @Override

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.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.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 {
@@ -243,7 +244,7 @@ public List<Register> getCalleeSaveRegisters() {
 
     @Override
     public PlatformKind getCalleeSaveRegisterStorageKind(Architecture arch, Register calleeSaveRegister) {
-        if (Platform.includedIn(Platform.WINDOWS.class) && AMD64.XMM.equals(calleeSaveRegister.getRegisterCategory())) {
+        if (Platform.includedIn(InternalPlatform.WINDOWS_BASE.class) && AMD64.XMM.equals(calleeSaveRegister.getRegisterCategory())) {
             VMError.guarantee(calleeSaveRegister.encoding() >= xmm6.encoding() && calleeSaveRegister.encoding() <= xmm15.encoding(), "unexpected callee saved register");
             return V128_QWORD;
         }
@@ -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.class)) {
+                if (type.nativeABI() && Platform.includedIn(InternalPlatform.WINDOWS_BASE.class)) {
                     // Strictly positional: float parameters consume a general register and vice
                     // versa
                     currentGeneral = i;

substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsJavaLangSubstitutions.java

@@ -27,19 +27,16 @@
 import java.io.Console;
 import java.util.Objects;
 
-import jdk.graal.compiler.word.Word;
-import org.graalvm.nativeimage.Platform;
-import org.graalvm.nativeimage.Platforms;
-
 import com.oracle.svm.core.Uninterruptible;
 import com.oracle.svm.core.annotate.Alias;
 import com.oracle.svm.core.annotate.RecomputeFieldValue;
 import com.oracle.svm.core.annotate.Substitute;
 import com.oracle.svm.core.annotate.TargetClass;
 import com.oracle.svm.core.jdk.Jvm;
 
+import jdk.graal.compiler.word.Word;
+
 @TargetClass(java.lang.System.class)
-@Platforms(Platform.WINDOWS.class)
 final class Target_java_lang_System {
 
     @Alias @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.Reset) static volatile Console cons;
@@ -64,7 +61,6 @@ public static long currentTimeMillis() {
 }
 
 /** Dummy class to have a class with the file's name. */
-@Platforms(Platform.WINDOWS.class)
 public final class WindowsJavaLangSubstitutions {
 
     /** Private constructor: No instances. */

substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsJavaNIOSubstitutions.java

@@ -24,18 +24,13 @@
  */
 package com.oracle.svm.core.windows;
 
-import org.graalvm.nativeimage.Platform;
-import org.graalvm.nativeimage.Platforms;
-
 import com.oracle.svm.core.annotate.Alias;
 import com.oracle.svm.core.annotate.RecomputeFieldValue;
 import com.oracle.svm.core.annotate.TargetClass;
 
-@Platforms(Platform.WINDOWS.class)
 public final class WindowsJavaNIOSubstitutions {
 
     @TargetClass(className = "sun.nio.fs.Cancellable")
-    @Platforms({Platform.WINDOWS.class})
     static final class Target_sun_nio_fs_Cancellable {
         @Alias @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.Manual)//
         private long pollingAddress;

substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsNativeLibrarySupport.java

@@ -26,9 +26,6 @@
 
 import java.io.FileDescriptor;
 
-import jdk.graal.compiler.word.Word;
-import org.graalvm.nativeimage.Platform;
-import org.graalvm.nativeimage.Platforms;
 import org.graalvm.nativeimage.c.type.CCharPointer;
 import org.graalvm.nativeimage.c.type.CTypeConversion;
 import org.graalvm.nativeimage.c.type.CTypeConversion.CCharPointerHolder;
@@ -50,8 +47,9 @@
 import com.oracle.svm.core.windows.headers.WinBase.HMODULE;
 import com.oracle.svm.core.windows.headers.WinSock;
 
+import jdk.graal.compiler.word.Word;
+
 @AutomaticallyRegisteredFeature
-@Platforms(Platform.WINDOWS.class)
 class WindowsNativeLibraryFeature implements InternalFeature {
     @Override
     public void duringSetup(DuringSetupAccess access) {
@@ -198,7 +196,6 @@ public PointerBase findSymbol(String name) {
 }
 
 @TargetClass(className = "java.io.WinNTFileSystem")
-@Platforms(Platform.WINDOWS.class)
 final class Target_java_io_WinNTFileSystem {
     @Alias
     static native void initIDs();

substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsPlatformThreads.java

@@ -24,8 +24,6 @@
  */
 package com.oracle.svm.core.windows;
 
-import jdk.graal.compiler.word.Word;
-import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platform.HOSTED_ONLY;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.nativeimage.c.function.CFunctionPointer;
@@ -51,9 +49,9 @@
 import com.oracle.svm.core.windows.headers.WinBase;
 
 import jdk.graal.compiler.core.common.NumUtil;
+import jdk.graal.compiler.word.Word;
 
 @AutomaticallyRegisteredImageSingleton(PlatformThreads.class)
-@Platforms(Platform.WINDOWS.class)
 public final class WindowsPlatformThreads extends PlatformThreads {
     @Platforms(HOSTED_ONLY.class)
     WindowsPlatformThreads() {
@@ -180,7 +178,6 @@ protected void yieldCurrent() {
     }
 }
 
-@Platforms(Platform.WINDOWS.class)
 class WindowsParker extends Parker {
     private static final long MAX_DWORD = (1L << 32) - 1;
 
@@ -276,7 +273,6 @@ protected void release() {
 }
 
 @AutomaticallyRegisteredImageSingleton(ParkerFactory.class)
-@Platforms(Platform.WINDOWS.class)
 class WindowsParkerFactory implements ParkerFactory {
     @Override
     public Parker acquire() {