Merge remote-tracking branch 'upstream/master'

gluonhq · Sep 27, 2023 · 9ef6aa5 · 9ef6aa5
2 parents ac0e3ee + aa5f3c5
commit 9ef6aa5
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 6 deletions.
diff --git a/compiler/mx.compiler/suite.py b/compiler/mx.compiler/suite.py
@@ -471,8 +471,19 @@
           "jdk.unsupported" # sun.misc.Unsafe
         ],
         "exports" : [
-          """* to com.oracle.graal.graal_enterprise,org.graalvm.nativeimage.pointsto,org.graalvm.nativeimage.builder,org.graalvm.nativeimage.foreign,org.graalvm.nativeimage.llvm,com.oracle.svm.svm_enterprise,com.oracle.svm_enterprise.ml_dataset,org.graalvm.nativeimage.base,
-          org.graalvm.extraimage.builder,com.oracle.svm.extraimage_enterprise,org.graalvm.truffle.runtime.svm,com.oracle.truffle.enterprise.svm""",
+          """* to com.oracle.graal.graal_enterprise,
+                  org.graalvm.nativeimage.pointsto,
+                  org.graalvm.nativeimage.builder,
+                  org.graalvm.nativeimage.foreign,
+                  org.graalvm.nativeimage.llvm,
+                  com.oracle.svm.svm_enterprise,
+                  com.oracle.svm_enterprise.ml_dataset,
+                  org.graalvm.nativeimage.base,
+                  org.graalvm.extraimage.builder,
+                  org.graalvm.extraimage.librarysupport,
+                  com.oracle.svm.extraimage_enterprise,
+                  org.graalvm.truffle.runtime.svm,
+                  com.oracle.truffle.enterprise.svm""",
           "org.graalvm.compiler.java                   to org.graalvm.nativeimage.agent.tracing,org.graalvm.nativeimage.configure",
           "org.graalvm.compiler.core.common            to org.graalvm.nativeimage.agent.tracing,org.graalvm.nativeimage.objectfile",
           "org.graalvm.compiler.debug                  to org.graalvm.nativeimage.objectfile",

diff --git a/substratevm/mx.substratevm/suite.py b/substratevm/mx.substratevm/suite.py
@@ -1404,7 +1404,25 @@
                 "name" : "org.graalvm.nativeimage.builder",
                 "exports" : [
                     "com.oracle.svm.hosted                        to java.base",
-                    "* to org.graalvm.nativeimage.base,jdk.internal.vm.compiler,org.graalvm.nativeimage.driver,org.graalvm.nativeimage.configure,org.graalvm.nativeimage.librarysupport,org.graalvm.nativeimage.junitsupport,org.graalvm.nativeimage.llvm,org.graalvm.nativeimage.agent.jvmtibase,org.graalvm.nativeimage.agent.tracing,org.graalvm.nativeimage.agent.diagnostics,com.oracle.svm.svm_enterprise,com.oracle.svm.svm_enterprise.llvm,com.oracle.svm_enterprise.ml_dataset,org.graalvm.extraimage.builder,com.oracle.svm.extraimage_enterprise,org.graalvm.nativeimage.foreign,org.graalvm.truffle.runtime.svm,com.oracle.truffle.enterprise.svm",
+                    """* to org.graalvm.nativeimage.base,
+                            jdk.internal.vm.compiler,
+                            org.graalvm.nativeimage.driver,
+                            org.graalvm.nativeimage.configure,
+                            org.graalvm.nativeimage.librarysupport,
+                            org.graalvm.nativeimage.junitsupport,
+                            org.graalvm.nativeimage.llvm,
+                            org.graalvm.nativeimage.agent.jvmtibase,
+                            org.graalvm.nativeimage.agent.tracing,
+                            org.graalvm.nativeimage.agent.diagnostics,
+                            com.oracle.svm.svm_enterprise,
+                            com.oracle.svm.svm_enterprise.llvm,
+                            com.oracle.svm_enterprise.ml_dataset,
+                            org.graalvm.extraimage.builder,
+                            org.graalvm.extraimage.librarysupport,
+                            com.oracle.svm.extraimage_enterprise,
+                            org.graalvm.nativeimage.foreign,
+                            org.graalvm.truffle.runtime.svm,
+                            com.oracle.truffle.enterprise.svm""",
                 ],
                 "opens" : [
                     "com.oracle.svm.core                          to jdk.internal.vm.compiler",

diff --git a/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java b/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java
@@ -1873,7 +1873,7 @@ public static List<String> translateAPIOptions(List<String> arguments) {
         return translatedOptions;
     }
 
-    private static void performBuild(BuildConfiguration config, Function<BuildConfiguration, NativeImage> nativeImageProvider) {
+    protected static void performBuild(BuildConfiguration config, Function<BuildConfiguration, NativeImage> nativeImageProvider) {
         try {
             build(config, nativeImageProvider);
         } catch (NativeImageError e) {
@@ -1894,7 +1894,7 @@ private static void performBuild(BuildConfiguration config, Function<BuildConfig
         System.exit(ExitStatus.OK.getValue());
     }
 
-    protected static void build(BuildConfiguration config, Function<BuildConfiguration, NativeImage> nativeImageProvider) {
+    private static void build(BuildConfiguration config, Function<BuildConfiguration, NativeImage> nativeImageProvider) {
         NativeImage nativeImage = nativeImageProvider.apply(config);
         if (config.getBuildArgs().isEmpty()) {
             nativeImage.showMessage(usageText);

diff --git a/vm/mx.vm/suite.py b/vm/mx.vm/suite.py
@@ -65,7 +65,7 @@
             },
             {
                 "name": "graalpython",
-                "version": "01a47168e0e9bff923eca6d81057beaff7d36b1b",
+                "version": "9807f8e2d574e39d44d0cf2ee6e5d0540e2feb0e",
                 "dynamic": True,
                 "urls": [
                     {"url": "https://github.com/graalvm/graalpython.git", "kind": "git"},