Merge branch 'master' into build-with-19-loom

Author: oraluben

compiler/mx.compiler/suite.py

@@ -2043,7 +2043,7 @@
           "org.graalvm.compiler.core.common            to jdk.internal.vm.compiler.management,org.graalvm.nativeimage.agent.tracing,org.graalvm.nativeimage.objectfile",
           "org.graalvm.compiler.debug                  to jdk.internal.vm.compiler.management,org.graalvm.nativeimage.objectfile",
           "org.graalvm.compiler.hotspot                to jdk.internal.vm.compiler.management",
-          "org.graalvm.compiler.nodes.graphbuilderconf to org.graalvm.nativeimage.driver",
+          "org.graalvm.compiler.nodes.graphbuilderconf to org.graalvm.nativeimage.driver,org.graalvm.nativeimage.librarysupport",
           "org.graalvm.compiler.options                to jdk.internal.vm.compiler.management,org.graalvm.nativeimage.driver,org.graalvm.nativeimage.junitsupport",
           "org.graalvm.compiler.phases.common          to org.graalvm.nativeimage.agent.tracing,org.graalvm.nativeimage.configure",
           "org.graalvm.compiler.serviceprovider        to jdk.internal.vm.compiler.management,org.graalvm.nativeimage.driver,org.graalvm.nativeimage.agent.jvmtibase,org.graalvm.nativeimage.agent.diagnostics",

compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GraphDecoder.java

@@ -558,6 +558,11 @@ protected final void decode(LoopScope initialLoopScope) {
                 } else {
                     propagateCreatedNodes(loopScope);
                     loopScope = loopScope.outer;
+
+                    if (loopScope == null) {
+                        // finished all loops of a method
+                        afterMethodScope(methodScope);
+                    }
                 }
             }
 
@@ -577,6 +582,9 @@ protected final void decode(LoopScope initialLoopScope) {
         }
     }
 
+    protected void afterMethodScope(@SuppressWarnings("unused") MethodScope methodScope) {
+    }
+
     protected void finishInlining(@SuppressWarnings("unused") MethodScope inlineScope) {
     }
 

compiler/src/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/GraphPrinterDumpHandler.java

@@ -264,14 +264,25 @@ private List<String> getInlineContext(Graph graph) {
                     lastMethodOrGraph = o;
                 }
             }
-            // Truffle compilations don't have a standard inline context.
-            // Since TruffleDebugJavaMethod specifies the declaring class for truffle compilations
-            // as "LTruffleGraal" we identify truffle compilations as starting with "TruffleGraal"
-            if (result.size() == 2 && result.get(1).startsWith("TruffleGraal")) {
-                String name = result.get(1).replace("TruffleGraal.", "TruffleIR::");
-                result.clear();
-                result.add(name);
+
+            for (int i = 0; i < result.size(); i++) {
+                /*
+                 * Truffle compilations don't have a standard inline context. Since
+                 * TruffleDebugJavaMethod specifies the declaring class for truffle compilations as
+                 * "LTruffleGraal" we identify truffle compilations as starting with "TruffleGraal"
+                 */
+                String name = result.get(i);
+                String search = "TruffleGraal.";
+                if (name.startsWith(search)) {
+                    result.set(i, "TruffleIR::" + name.substring(search.length(), name.length()));
+                    if (i > 0) {
+                        // we can drop previous entry which is just profiledPERoot
+                        result.remove(i - 1);
+                    }
+                    break;
+                }
             }
+
             if (result.isEmpty()) {
                 result.add(graph.toString());
                 graphSeen = true;

compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/PEGraphDecoder.java

@@ -1044,10 +1044,6 @@ protected boolean tryInvocationPlugin(PEMethodScope methodScope, LoopScope loopS
                 return false;
             }
 
-            if (loopScope.methodScope.encodedGraph.isCallToOriginal(targetMethod)) {
-                return false;
-            }
-
             ValueNode[] arguments = callTarget.arguments().toArray(ValueNode.EMPTY_ARRAY);
             FixedWithNextNode invokePredecessor = (FixedWithNextNode) invoke.asNode().predecessor();
 
@@ -1206,6 +1202,17 @@ protected LoopScope doInline(PEMethodScope methodScope, LoopScope loopScope, Inv
         return inlineLoopScope;
     }
 
+    @Override
+    protected void afterMethodScope(MethodScope methodScope) {
+        /*
+         * The graph should be in a valid state after a method scope was completed. Revisit this
+         * assumption if there are any crashes during dumping.
+         */
+        if (debug.isDumpEnabled(DebugContext.VERY_DETAILED_LEVEL)) {
+            debug.dump(DebugContext.VERY_DETAILED_LEVEL, graph, "After PE %s", ((PEMethodScope) methodScope).method.format("%H.%n"));
+        }
+    }
+
     @Override
     protected void finishInlining(MethodScope is) {
         PEMethodScope inlineScope = (PEMethodScope) is;

docs/reference-manual/native-image/BuildOutput.md

@@ -46,7 +46,6 @@ Top 10 packages in code area:           Top 10 object types in image heap:
   97.42KB java.util.logging              139.54KB byte[] for embedded resources
   95.18KB c.oracle.svm.core.genscavenge  139.04KB char[]
    1.83MB for 118 more packages            1.29MB for 753 more object types
-                       (use GraalVM Dashboard to see all)
 --------------------------------------------------------------------------------
     0.9s (5.6% of total time) in 17 GCs | Peak RSS: 3.22GB | CPU load: 10.87
 --------------------------------------------------------------------------------

java-benchmarks/mx.java-benchmarks/mx_java_benchmarks.py

@@ -371,6 +371,11 @@ def extra_image_build_argument(self, benchmark, args):
                 '-H:EnableURLProtocols=http',
                 '-H:NativeLinkerOption=-no-pie',
                 '-H:-UseServiceLoaderFeature',
+                '--add-exports=org.graalvm.nativeimage.base/com.oracle.svm.util=ALL-UNNAMED',
+                '--add-exports=org.graalvm.nativeimage.builder/com.oracle.svm.core.configure=ALL-UNNAMED',
+                '--add-exports=org.graalvm.nativeimage.builder/com.oracle.svm.core.jdk.localization=ALL-UNNAMED',
+                '--add-exports=org.graalvm.nativeimage.builder/com.oracle.svm.core.jdk=ALL-UNNAMED',
+                '--add-exports=org.graalvm.nativeimage.builder/com.oracle.svm.core.threadlocal=ALL-UNNAMED',
                 '-H:+StackTrace'] + super(BaseQuarkusBenchmarkSuite, self).extra_image_build_argument(benchmark, args)
 
 
@@ -460,6 +465,11 @@ def build_assertions(self, benchmark, is_gate):
         # This method overrides NativeImageMixin.build_assertions
         return []  # We are skipping build assertions due to some failed asserts while building Micronaut apps.
 
+    def extra_image_build_argument(self, benchmark, args):
+        return [
+                   '--add-exports=org.graalvm.nativeimage.builder/com.oracle.svm.core.jdk=ALL-UNNAMED',
+               ] + super(BaseMicronautBenchmarkSuite, self).extra_image_build_argument(benchmark, args)
+
     def default_stages(self):
         return ['instrument-image', 'instrument-run', 'image', 'run']
 

sdk/CHANGELOG.md

@@ -3,6 +3,7 @@
 This changelog summarizes major changes between GraalVM SDK versions. The main focus is on APIs exported by GraalVM SDK.
 
 ## Version 22.2.0
+* (GR-38925) Added `Value.hasMetaParents() and Value.getMetaParents()` that allow lookup of the hierarchy of parents for meta objects (e.g. super class or implemented interface of Java classes).
 * (GR-38351) Added [FileSystem#allowLanguageHomeAccess](https://www.graalvm.org/sdk/javadoc/org/graalvm/polyglot/io/FileSystem.html#allowLanguageHomeAccess-org.graalvm.polyglot.io.FileSystem-) returning a `FileSystem` that forwards access to files in the language home to the default file system.
 * (GR-38351) Added [FileSystem#newReadOnlyFileSystem](https://www.graalvm.org/sdk/javadoc/org/graalvm/polyglot/io/FileSystem.html#newReadOnlyFileSystem-org.graalvm.polyglot.io.FileSystem-) returning a read-only decorator for the given file system.
 * Changed the behavior of [`Context.close()`](https://www.graalvm.org/sdk/javadoc/org/graalvm/polyglot/Context.html#close--) (as well as `Context.close(false)` which is equivalent). In case the context was cancelled during the close operation or the context was exited during the close operation at request of the guest application, or it was already cancelled or exited before the close operation begins,

sdk/mx.sdk/mx_sdk_benchmark.py

@@ -672,6 +672,12 @@ class EmptyEnv():
     def __enter__(self):
         self._prev_environ = os.environ
         os.environ = {}
+        # urllib.request caches http_proxy, https_proxy etc. globally but doesn't cache no_proxy
+        # preserve no_proxy to avoid issues with proxies
+        if 'no_proxy' in self._prev_environ:
+            os.environ['no_proxy'] = self._prev_environ['no_proxy']
+        if 'NO_PROXY' in self._prev_environ:
+            os.environ['NO_PROXY'] = self._prev_environ['NO_PROXY']
     def __exit__(self, exc_type, exc_val, exc_tb):
         os.environ = self._prev_environ
 

sdk/src/org.graalvm.launcher/src/META-INF/native-image/org.graalvm.launcher/native-image.properties

@@ -1,4 +1,7 @@
-Args = --features=com.oracle.svm.thirdparty.jline.JLine3Feature \
+Args = --add-exports=org.graalvm.nativeimage.base/com.oracle.svm.util=ALL-UNNAMED \
+       --add-exports=org.graalvm.nativeimage.builder/com.oracle.svm.core.jdk=ALL-UNNAMED \
+       --add-exports=org.graalvm.nativeimage.builder/com.oracle.svm.core.jni=ALL-UNNAMED \
+       --features=com.oracle.svm.thirdparty.jline.JLine3Feature \
        --initialize-at-build-time=org.graalvm.launcher \
        -H:JNIConfigurationResources=${.}/launcher.jniconfig \
        --add-modules=java.scripting \

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

@@ -823,6 +823,7 @@ meth public static org.graalvm.nativeimage.c.type.CTypeConversion$CCharPointerHo
 meth public static org.graalvm.nativeimage.c.type.CTypeConversion$CCharPointerPointerHolder toCStrings(java.lang.CharSequence[])
 meth public static org.graalvm.word.UnsignedWord toCString(java.lang.CharSequence,java.nio.charset.Charset,org.graalvm.nativeimage.c.type.CCharPointer,org.graalvm.word.UnsignedWord)
 meth public static org.graalvm.word.UnsignedWord toCString(java.lang.CharSequence,org.graalvm.nativeimage.c.type.CCharPointer,org.graalvm.word.UnsignedWord)
+meth public static org.graalvm.nativeimage.c.type.CTypeConversion$CCharPointerHolder toCBytes(byte[])
 supr java.lang.Object
 
 CLSS public abstract interface static org.graalvm.nativeimage.c.type.CTypeConversion$CCharPointerHolder