Automatic merge of master into galahad

Author: OracleLabsAutomation

.github/workflows/micronaut.yml

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2024, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2024, 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
@@ -38,7 +38,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-name: Nightly Micronaut Tests
+name: Weekly Micronaut Tests
 
 on:
   push:
@@ -48,7 +48,7 @@ on:
     paths:
       - '.github/workflows/micronaut.yml'
   schedule:
-  - cron: '0 2 * * *'
+  - cron: '0 2 * * 1'
   workflow_dispatch:
 
 env:

.github/workflows/quarkus.yml

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 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
@@ -38,7 +38,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-name: Nightly Quarkus Tests
+name: Weekly Quarkus Tests
 
 on:
   push:
@@ -48,7 +48,7 @@ on:
     paths:
       - '.github/workflows/quarkus.yml'
   schedule:
-  - cron: '0 3 * * *'
+  - cron: '0 3 * * 1'
   workflow_dispatch:
 
 env:

.github/workflows/spring.yml

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2024, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2024, 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
@@ -38,7 +38,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-name: Nightly Spring Tests
+name: Weekly Spring Tests
 
 on:
   push:
@@ -48,7 +48,7 @@ on:
     paths:
       - '.github/workflows/spring.yml'
   schedule:
-  - cron: '0 4 * * *'
+  - cron: '0 4 * * 1'
   workflow_dispatch:
 
 env:

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/DynamicHub.java

@@ -40,11 +40,11 @@
 import static com.oracle.svm.core.code.RuntimeMetadataDecoderImpl.ALL_RECORD_COMPONENTS_FLAG;
 import static com.oracle.svm.core.code.RuntimeMetadataDecoderImpl.ALL_SIGNERS_FLAG;
 import static com.oracle.svm.core.code.RuntimeMetadataDecoderImpl.CLASS_ACCESS_FLAGS_MASK;
-import static com.oracle.svm.core.graal.meta.DynamicHubOffsets.writeObject;
-import static com.oracle.svm.core.graal.meta.DynamicHubOffsets.writeInt;
+import static com.oracle.svm.core.graal.meta.DynamicHubOffsets.writeByte;
 import static com.oracle.svm.core.graal.meta.DynamicHubOffsets.writeChar;
+import static com.oracle.svm.core.graal.meta.DynamicHubOffsets.writeInt;
+import static com.oracle.svm.core.graal.meta.DynamicHubOffsets.writeObject;
 import static com.oracle.svm.core.graal.meta.DynamicHubOffsets.writeShort;
-import static com.oracle.svm.core.graal.meta.DynamicHubOffsets.writeByte;
 import static com.oracle.svm.core.reflect.RuntimeMetadataDecoder.NO_DATA;
 
 import java.io.InputStream;
@@ -184,7 +184,7 @@ public final class DynamicHub implements AnnotatedElement, java.lang.reflect.Typ
      * The returned category does not necessarily match the {@link LayoutEncoding}, see
      * {@link Hybrid} objects for more details.
      */
-    private final int hubType;
+    private final byte hubType;
 
     /**
      * Used to quickly determine if this class is a subclass of {@link Reference}.
@@ -239,17 +239,20 @@ public final class DynamicHub implements AnnotatedElement, java.lang.reflect.Typ
     // region open-world only fields
 
     /**
-     * This stores the depth of the type in the inheritance hierarchy. If the type is an interface
-     * then the typeIDDepth is -1.
+     * This stores the depth of the type in the inheritance hierarchy. If the type is an interface,
+     * then the value is negative.
+     *
+     * Could be adapted so that {@link #getNumClassTypes()} can compute its value from this field,
+     * at the cost of increased size of type checks in code.
      */
     @UnknownPrimitiveField(availability = AfterHostedUniverse.class)//
-    private int typeIDDepth;
+    private short typeIDDepth;
 
     @UnknownPrimitiveField(availability = AfterHostedUniverse.class)//
-    private int numClassTypes;
+    private short numClassTypes;
 
     @UnknownPrimitiveField(availability = AfterHostedUniverse.class)//
-    private int numInterfaceTypes;
+    private short numInterfaceTypes;
 
     /**
      * Array containing this type's type check id information. During a type check, these slots are
@@ -452,7 +455,7 @@ public final class DynamicHub implements AnnotatedElement, java.lang.reflect.Typ
     private ReflectionMetadata reflectionMetadata;
 
     @Platforms(Platform.HOSTED_ONLY.class)
-    public DynamicHub(Class<?> hostedJavaClass, String name, int hubType, ReferenceType referenceType, DynamicHub superType,
+    public DynamicHub(Class<?> hostedJavaClass, String name, byte hubType, ReferenceType referenceType, DynamicHub superType,
                     DynamicHub componentHub, String sourceFileName, int modifiers, short flags, ClassLoader classLoader,
                     Class<?> nestHost, String simpleBinaryName, Object declaringClass, String signature, int layerId) {
         this.hostedJavaClass = hostedJavaClass;
@@ -500,7 +503,7 @@ public static DynamicHub allocate(String name, DynamicHub superHub, DynamicHub c
 
         ReferenceType referenceType = ReferenceType.computeReferenceType(DynamicHub.toClass(superHub));
         // GR-59683: HubType.OBJECT_ARRAY?
-        int hubTybe = referenceType == ReferenceType.None ? HubType.INSTANCE : HubType.REFERENCE_INSTANCE;
+        byte hubType = (byte) ((referenceType == ReferenceType.None) ? HubType.INSTANCE : HubType.REFERENCE_INSTANCE);
 
         DynamicHubCompanion companion = new DynamicHubCompanion(classLoader);
         /* Always allow unsafe allocation for classes that were loaded at run-time. */
@@ -517,9 +520,9 @@ public static DynamicHub allocate(String name, DynamicHub superHub, DynamicHub c
 
         // GR-59687: Determine typecheck related infos
         int typeID = 0;
-        int typeIDDepth = 0;
-        int numClassTypes = 2;
-        int numInterfacesTypes = 0;
+        short typeIDDepth = 0;
+        short numClassTypes = 2;
+        short numInterfacesTypes = 0;
         int[] openTypeWorldTypeCheckSlots = new int[numClassTypes + (numInterfacesTypes * 2)];
 
         byte additionalFlags = NumUtil.safeToUByte(makeFlag(IS_INSTANTIATED_BIT, true));
@@ -552,17 +555,17 @@ public static DynamicHub allocate(String name, DynamicHub superHub, DynamicHub c
         DynamicHubOffsets dynamicHubOffsets = DynamicHubOffsets.singleton();
         /* Write fields in defining order. */
         writeObject(hub, dynamicHubOffsets.getNameOffset(), name);
-        writeInt(hub, dynamicHubOffsets.getHubTypeOffset(), hubTybe);
+        writeByte(hub, dynamicHubOffsets.getHubTypeOffset(), hubType);
         writeByte(hub, dynamicHubOffsets.getReferenceTypeOffset(), referenceType.getValue());
 
         writeInt(hub, dynamicHubOffsets.getLayoutEncodingOffset(), layoutEncoding);
         writeInt(hub, dynamicHubOffsets.getTypeIDOffset(), typeID);
         // skip typeCheckStart, typeCheckRange, typeCheckSlot and
         // closedTypeWorldTypeCheckSlots (closed-world only)
-        writeInt(hub, dynamicHubOffsets.getTypeIDDepthOffset(), typeIDDepth);
-        writeInt(hub, dynamicHubOffsets.getNumClassTypesOffset(), numClassTypes);
+        writeShort(hub, dynamicHubOffsets.getTypeIDDepthOffset(), typeIDDepth);
+        writeShort(hub, dynamicHubOffsets.getNumClassTypesOffset(), numClassTypes);
 
-        writeInt(hub, dynamicHubOffsets.getNumInterfaceTypesOffset(), numInterfacesTypes);
+        writeShort(hub, dynamicHubOffsets.getNumInterfaceTypesOffset(), numInterfacesTypes);
         writeObject(hub, dynamicHubOffsets.getOpenTypeWorldTypeCheckSlotsOffset(), openTypeWorldTypeCheckSlots);
 
         writeChar(hub, dynamicHubOffsets.getMonitorOffsetOffset(), monitorOffset);
@@ -677,9 +680,9 @@ public void setOpenTypeWorldData(CFunctionPointer[] vtable, int typeID,
         assert this.vtable == null : "Initialization must be called only once";
 
         this.typeID = typeID;
-        this.typeIDDepth = typeCheckDepth;
-        this.numClassTypes = numClassTypes;
-        this.numInterfaceTypes = numInterfaceTypes;
+        this.typeIDDepth = NumUtil.safeToShortAE(typeCheckDepth);
+        this.numClassTypes = NumUtil.safeToShortAE(numClassTypes);
+        this.numInterfaceTypes = NumUtil.safeToShortAE(numInterfaceTypes);
         this.openTypeWorldTypeCheckSlots = typeCheckSlots;
         this.vtable = vtable;
     }

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SVMHost.java

@@ -610,7 +610,7 @@ public ClassInitializationSupport getClassInitializationSupport() {
         return classInitializationSupport;
     }
 
-    private static int computeHubType(AnalysisType type) {
+    private static byte computeHubType(AnalysisType type) {
         if (type.isArray()) {
             if (type.getComponentType().isPrimitive() || type.getComponentType().isWordType()) {
                 return HubType.PRIMITIVE_ARRAY;

wasm/CHANGELOG.md

@@ -5,6 +5,7 @@ This changelog summarizes major changes to the WebAssembly engine implemented in
 ## Version 24.2.0
 
 * Updated developer metadata of Maven artifacts.
+* Deprecated the `--wasm.AsyncParsingBinarySize` and `--wasm.AsyncParsingStackSize` options. These options no longer have any effect and will be removed in a future release.
 
 ## Version 24.1.0
 

wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/WasmInstantiator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 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
@@ -50,8 +50,6 @@
 import org.graalvm.collections.MapCursor;
 import org.graalvm.wasm.constants.BytecodeBitEncoding;
 import org.graalvm.wasm.constants.SegmentMode;
-import org.graalvm.wasm.exception.Failure;
-import org.graalvm.wasm.exception.WasmException;
 import org.graalvm.wasm.memory.WasmMemory;
 import org.graalvm.wasm.memory.WasmMemoryFactory;
 import org.graalvm.wasm.nodes.WasmCallStubNode;
@@ -74,22 +72,6 @@
  * Creates wasm instances by converting parser nodes into Truffle nodes.
  */
 public class WasmInstantiator {
-    private static final int MIN_DEFAULT_STACK_SIZE = 1_000_000;
-    private static final int MAX_DEFAULT_ASYNC_STACK_SIZE = 10_000_000;
-
-    private static final class ParsingExceptionHandler implements Thread.UncaughtExceptionHandler {
-        private Throwable parsingException = null;
-
-        @Override
-        public void uncaughtException(Thread t, Throwable e) {
-            this.parsingException = e;
-        }
-
-        public Throwable parsingException() {
-            return parsingException;
-        }
-    }
-
     private final WasmLanguage language;
 
     @TruffleBoundary
@@ -101,30 +83,7 @@ public WasmInstantiator(WasmLanguage language) {
     public WasmInstance createInstance(WasmContext context, WasmModule module, TruffleContext truffleContext) {
         WasmInstance instance = new WasmInstance(context, module, truffleContext);
         instance.createLinkActions();
-        int binarySize = instance.module().bytecodeLength();
-        final int asyncParsingBinarySize = WasmOptions.AsyncParsingBinarySize.getValue(context.environment().getOptions());
-        if (binarySize < asyncParsingBinarySize || !context.environment().isCreateThreadAllowed()) {
-            instantiateCodeEntries(context, instance);
-        } else {
-            final Runnable parsing = () -> instantiateCodeEntries(context, instance);
-            final String name = "wasm-parsing-thread(" + instance.name() + ")";
-            final int requestedSize = WasmOptions.AsyncParsingStackSize.getValue(context.environment().getOptions()) * 1000;
-            final int defaultSize = Math.max(MIN_DEFAULT_STACK_SIZE, Math.min(2 * binarySize, MAX_DEFAULT_ASYNC_STACK_SIZE));
-            final int stackSize = requestedSize != 0 ? requestedSize : defaultSize;
-            final Thread parsingThread = context.environment().newTruffleThreadBuilder(parsing).stackSize(stackSize).build();
-            parsingThread.setName(name);
-            final ParsingExceptionHandler handler = new ParsingExceptionHandler();
-            parsingThread.setUncaughtExceptionHandler(handler);
-            parsingThread.start();
-            try {
-                parsingThread.join();
-                if (handler.parsingException() != null) {
-                    throw WasmException.create(Failure.UNSPECIFIED_INVALID, "Asynchronous parsing failed.");
-                }
-            } catch (InterruptedException e) {
-                throw WasmException.create(Failure.UNSPECIFIED_INVALID, "Asynchronous parsing interrupted.");
-            }
-        }
+        instantiateCodeEntries(context, instance);
         return instance;
     }
 

wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/WasmOptions.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 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
@@ -51,10 +51,12 @@ public class WasmOptions {
     @Option(help = "A comma-separated list of builtin modules to use.", category = OptionCategory.USER, stability = OptionStability.STABLE, usageSyntax = "[<linkingName>:]<builtinModuleName>,[<linkingName>:]<builtinModuleName>,...")//
     public static final OptionKey<String> Builtins = new OptionKey<>("");
 
-    @Option(help = "The minimal binary size for which to use async parsing. If threads are not supported, async parsing will not be used.", category = OptionCategory.USER, stability = OptionStability.STABLE, usageSyntax = "[0, inf)")//
+    @Option(help = "The minimal binary size for which to use async parsing. If threads are not supported, async parsing will not be used.", category = OptionCategory.USER, stability = OptionStability.STABLE, usageSyntax = "[0, inf)", //
+                    deprecated = true, deprecationMessage = "Option no longer has any effect and can be safely omitted.")//
     public static final OptionKey<Integer> AsyncParsingBinarySize = new OptionKey<>(100_000);
 
-    @Option(help = "The stack size in kilobytes to use during async parsing, or zero to use defaults.", category = OptionCategory.USER, stability = OptionStability.STABLE, usageSyntax = "[0, inf)")//
+    @Option(help = "The stack size in kilobytes to use during async parsing, or zero to use defaults.", category = OptionCategory.USER, stability = OptionStability.STABLE, usageSyntax = "[0, inf)", //
+                    deprecated = true, deprecationMessage = "Option no longer has any effect and can be safely omitted.")//
     public static final OptionKey<Integer> AsyncParsingStackSize = new OptionKey<>(0);
 
     @Option(help = "A comma-separated list of pre-opened Wasi directories.", category = OptionCategory.USER, stability = OptionStability.STABLE, usageSyntax = "[<virtualDir>::]<hostDir>,[<virtualDir>::]<hostDir>,...")//