merge with upstream

Author: zapster

.github/workflows/main.yml

@@ -42,6 +42,8 @@ env:
   MX_GIT_CACHE: refcache
   MX_PATH: ${{ github.workspace }}/mx
   MX_PYTHON: python3.8
+  # Enforce experimental option checking in CI (GR-47922)
+  NATIVE_IMAGE_EXPERIMENTAL_OPTIONS_ARE_FATAL: "true"
 
 permissions:
   contents: read # to fetch code (actions/checkout)

ci.jsonnet

@@ -40,13 +40,16 @@ local visualizer = import 'visualizer/ci/ci.jsonnet';
 
 local verify_ci = (import 'ci/ci_common/ci-check.libsonnet').verify_ci;
 
+# JDK latest only works on MacOS Ventura (GR-49652)
+local exclude_latest_darwin_amd64(builds) = [b for b in builds if !(import 'ci/ci_common/common-utils.libsonnet').contains(b.name, "labsjdk-latest-darwin-amd64")];
+
 {
   # Ensure that non-hidden entries in ci/common.jsonnet and ci/ci_common/common.jsonnet can be resolved.
   assert std.length(std.toString(import 'ci/ci_common/common.jsonnet')) > 0,
   ci_resources:: (import 'ci/ci_common/ci-resources.libsonnet'),
   overlay: graal_common.ci.overlay,
   specVersion: "3",
-  builds: [common.add_excludes_guard(b) for b in (
+  builds: exclude_latest_darwin_amd64([common.add_excludes_guard(b) for b in (
     compiler.builds +
     wasm.builds +
     espresso.builds +
@@ -59,7 +62,7 @@ local verify_ci = (import 'ci/ci_common/ci-check.libsonnet').verify_ci;
     javadoc.builds +
     vm.builds +
     visualizer.builds
-  )],
+  )]),
   assert verify_ci(self.builds),
   // verify that the run-spec demo works
   assert (import "ci/ci_common/run-spec-demo.jsonnet").check(),

ci/common.jsonnet

@@ -277,6 +277,10 @@ local common_json = import "../common.json";
       # Keep in sync with com.oracle.svm.hosted.NativeImageOptions#DEFAULT_ERROR_FILE_NAME
       " (?P<filename>.+/svm_err_b_\\d+T\\d+\\.\\d+_pid\\d+\\.md)",
     ],
+    environment+: {
+      # Enforce experimental option checking in CI (GR-47922)
+      NATIVE_IMAGE_EXPERIMENTAL_OPTIONS_ARE_FATAL: "true",
+    },
   },
 
   // OS specific file handling

compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/replacements/processor/GeneratedFoldPlugin.java

@@ -196,7 +196,7 @@ protected void createHelpers(AbstractProcessor processor, PrintWriter out, Injec
             if (processor.getAnnotation(param, processor.getType(INJECTED_PARAMETER_CLASS_NAME)) == null) {
                 constantArgument(processor, out, deps, argCount, param.asType(), argCount, true);
             } else {
-                out.printf("        assert args.get(%d).isNullConstant();\n", argCount);
+                out.printf("        assert args.get(%d).isNullConstant() : \"Must be null constant \" + args.get(%d);\n", argCount, argCount);
                 out.printf("        %s arg%d = %s;\n", param.asType(), argCount, deps.find(processor, (DeclaredType) param.asType()).getExpression(processor, intrinsicMethod));
             }
             argCount++;

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/CheckGraalInvariants.java

@@ -51,6 +51,11 @@
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
+import org.graalvm.word.LocationIdentity;
+import org.junit.Assert;
+import org.junit.Assume;
+import org.junit.Test;
+
 import jdk.graal.compiler.api.replacements.Snippet;
 import jdk.graal.compiler.api.replacements.Snippet.ConstantParameter;
 import jdk.graal.compiler.api.replacements.Snippet.NonNullParameter;
@@ -98,11 +103,6 @@
 import jdk.graal.compiler.phases.util.Providers;
 import jdk.graal.compiler.runtime.RuntimeProvider;
 import jdk.graal.compiler.test.AddExports;
-import org.graalvm.word.LocationIdentity;
-import org.junit.Assert;
-import org.junit.Assume;
-import org.junit.Test;
-
 import jdk.internal.misc.Unsafe;
 import jdk.vm.ci.code.BailoutException;
 import jdk.vm.ci.code.Register;
@@ -219,6 +219,11 @@ public boolean shouldCheckUsage(OptionDescriptor option) {
             }
             return true;
         }
+
+        public boolean checkAssertions() {
+            return true;
+        }
+
     }
 
     @Test
@@ -339,6 +344,13 @@ public static void runTest(InvariantsTool tool) {
         verifiers.add(new VerifyPluginFrameState());
         verifiers.add(new VerifyGraphUniqueUsages());
         verifiers.add(new VerifyEndlessLoops());
+        VerifyAssertionUsage assertionUsages = null;
+        boolean checkAssertions = tool.checkAssertions();
+
+        if (checkAssertions) {
+            assertionUsages = new VerifyAssertionUsage(metaAccess);
+            verifiers.add(assertionUsages);
+        }
 
         loadVerifiers(verifiers);
 
@@ -446,6 +458,15 @@ public static void runTest(InvariantsTool tool) {
             }
         }
 
+        if (assertionUsages != null) {
+            assert checkAssertions;
+            try {
+                assertionUsages.postProcess();
+            } catch (Throwable e) {
+                errors.add(e.getMessage());
+            }
+        }
+
         checkOptionFieldUsages(errors, optionFieldUsages);
 
         if (!errors.isEmpty()) {