Merge remote-tracking branch 'oracle/release/graal-vm/23.0' into 2023…

…-10-23-mandrel-23.0-upstream-sync
zakkak · Oct 24, 2023 · 799b29b · 799b29b
2 parents d3b927d + aeab112
commit 799b29b
Show file tree

Hide file tree

Showing 75 changed files with 2,338 additions and 566 deletions.
diff --git a/common.json b/common.json
@@ -11,12 +11,12 @@
     "oraclejdk11":        {"name": "jpg-jdk",   "version": "11.0.11", "build_id": "9", "release": true, "platformspecific": true, "extrabundles": ["static-libs"] },
 
     "oraclejdk17":        {"name": "jpg-jdk",   "version": "17.0.1",  "build_id": "12", "release": true, "platformspecific": true, "extrabundles": ["static-libs"]},
-    "labsjdk-ce-17":      {"name": "labsjdk",   "version": "ce-17.0.8+7-jvmci-23.0-b15", "platformspecific": true },
-    "labsjdk-ce-17Debug": {"name": "labsjdk",   "version": "ce-17.0.8+7-jvmci-23.0-b15-debug", "platformspecific": true },
-    "labsjdk-ce-17-llvm": {"name": "labsjdk",   "version": "ce-17.0.8+7-jvmci-23.0-b15-sulong", "platformspecific": true },
-    "labsjdk-ee-17":      {"name": "labsjdk",   "version": "ee-17.0.8+9-jvmci-23.0-b14", "platformspecific": true },
-    "labsjdk-ee-17Debug": {"name": "labsjdk",   "version": "ee-17.0.8+9-jvmci-23.0-b14-debug", "platformspecific": true },
-    "labsjdk-ee-17-llvm": {"name": "labsjdk",   "version": "ee-17.0.8+9-jvmci-23.0-b14-sulong", "platformspecific": true },
+    "labsjdk-ce-17":      {"name": "labsjdk",   "version": "ce-17.0.9+9-jvmci-23.0-b22", "platformspecific": true },
+    "labsjdk-ce-17Debug": {"name": "labsjdk",   "version": "ce-17.0.9+9-jvmci-23.0-b22-debug", "platformspecific": true },
+    "labsjdk-ce-17-llvm": {"name": "labsjdk",   "version": "ce-17.0.9+9-jvmci-23.0-b22-sulong", "platformspecific": true },
+    "labsjdk-ee-17":      {"name": "labsjdk",   "version": "ee-17.0.9+11-jvmci-23.0-b21", "platformspecific": true },
+    "labsjdk-ee-17Debug": {"name": "labsjdk",   "version": "ee-17.0.9+11-jvmci-23.0-b21-debug", "platformspecific": true },
+    "labsjdk-ee-17-llvm": {"name": "labsjdk",   "version": "ee-17.0.9+11-jvmci-23.0-b21-sulong", "platformspecific": true },
 
     "oraclejdk19":        {"name": "jpg-jdk",   "version": "19",      "build_id": "26", "release": true, "platformspecific": true, "extrabundles": ["static-libs"]},
     "labsjdk-ce-19":      {"name": "labsjdk",   "version": "ce-19.0.1+10-jvmci-23.0-b04", "platformspecific": true },

diff --git a/compiler/mx.compiler/suite.py b/compiler/mx.compiler/suite.py
@@ -4,8 +4,8 @@
   "sourceinprojectwhitelist" : [],
 
   "groupId" : "org.graalvm.compiler",
-  "version" : "23.0.2.0",
-  "release" : True,
+  "version" : "23.0.2.1",
+  "release" : False,
   "url" : "http://www.graalvm.org/",
   "developer" : {
     "name" : "GraalVM Development",
@@ -1526,6 +1526,11 @@
       "requires" : [
         "jdk.unsupported",
       ],
+      "requiresConcealed" : {
+        "java.base" : [
+          "jdk.internal.vm.annotation",
+        ]
+      },
       "checkstyle" : "org.graalvm.compiler.graph",
       "javaCompliance" : "17+",
       "workingSets" : "Graal,Test",

diff --git a/....compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/UnimplementedGraalIntrinsics.java b/....compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/UnimplementedGraalIntrinsics.java
@@ -399,7 +399,7 @@ public UnimplementedGraalIntrinsics(GraalHotSpotVMConfig config, Architecture ar
                             "jdk/internal/vm/vector/VectorSupport.unaryOp(ILjava/lang/Class;Ljava/lang/Class;ILjava/lang/Object;Ljava/util/function/Function;)Ljava/lang/Object;"
                             // @formatter:on
             );
-            add(ignore,
+            add(toBeInvestigated,
                             "jdk/internal/misc/Unsafe.storeStoreFence()V");
         }
 

diff --git a/...iler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotAllocationSnippets.java b/...iler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotAllocationSnippets.java
@@ -146,10 +146,11 @@ public HotSpotAllocationSnippets(GraalHotSpotVMConfig config, HotSpotRegistersPr
     @Snippet
     protected Object allocateInstance(KlassPointer hub,
                     @ConstantParameter long size,
+                    @ConstantParameter boolean forceSlowPath,
                     @ConstantParameter FillContent fillContents,
                     @ConstantParameter boolean emitMemoryBarrier,
                     @ConstantParameter HotSpotAllocationProfilingData profilingData) {
-        Object result = allocateInstanceImpl(hub.asWord(), WordFactory.unsigned(size), fillContents, emitMemoryBarrier, true, profilingData);
+        Object result = allocateInstanceImpl(hub.asWord(), WordFactory.unsigned(size), forceSlowPath, fillContents, emitMemoryBarrier, true, profilingData);
         return piCastToSnippetReplaceeStamp(result);
     }
 
@@ -194,7 +195,7 @@ public Object allocateInstanceDynamic(@NonNullParameter Class<?> type,
                      * binding of parameters is not yet supported by the GraphBuilderPlugin system.
                      */
                     UnsignedWord size = WordFactory.unsigned(layoutHelper);
-                    return allocateInstanceImpl(nonNullHub.asWord(), size, fillContents, emitMemoryBarrier, false, profilingData);
+                    return allocateInstanceImpl(nonNullHub.asWord(), size, false, fillContents, emitMemoryBarrier, false, profilingData);
                 }
             } else {
                 DeoptimizeNode.deopt(None, RuntimeConstraint);
@@ -657,12 +658,14 @@ public void lower(NewInstanceNode node, LoweringTool tool) {
             HotSpotResolvedObjectType type = (HotSpotResolvedObjectType) node.instanceClass();
             assert !type.isArray();
             ConstantNode hub = ConstantNode.forConstant(KlassPointerStamp.klassNonNull(), type.klass(), tool.getMetaAccess(), graph);
-            long size = instanceSize(type);
+            long size = type.instanceSize();
 
             OptionValues localOptions = graph.getOptions();
             Arguments args = new Arguments(allocateInstance, graph.getGuardsStage(), tool.getLoweringStage());
             args.add("hub", hub);
-            args.addConst("size", size);
+            // instanceSize returns a negative number for types which should be slow path allocated
+            args.addConst("size", Math.abs(size));
+            args.addConst("forceSlowPath", size < 0);
             args.addConst("fillContents", FillContent.fromBoolean(node.fillContents()));
             args.addConst("emitMemoryBarrier", node.emitMemoryBarrier());
             args.addConst("profilingData", getProfilingData(localOptions, "instance", type));
@@ -794,11 +797,6 @@ private static HotSpotResolvedObjectType lookupArrayClass(LoweringTool tool, Jav
             return HotSpotAllocationSnippets.lookupArrayClass(tool.getMetaAccess(), kind);
         }
 
-        private static long instanceSize(HotSpotResolvedObjectType type) {
-            long size = type.instanceSize();
-            assert size >= 0;
-            return size;
-        }
     }
 
     private static class HotSpotAllocationProfilingData extends AllocationProfilingData {