call VM.shutdown during HotSpotGraalRuntime shutdown

physicsfamily · May 18, 2019 · f52efa0 · f52efa0
1 parent 2c73fc4
commit f52efa0
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/...rc/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalRuntime.java b/...rc/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalRuntime.java
@@ -398,6 +398,16 @@ void shutdown() {
         BenchmarkCounters.shutdown(runtime(), optionsRef.get(), runtimeStartTime);
 
         outputDirectory.close();
+
+        shutdownLibGraal();
+    }
+
+    /**
+     * Substituted by
+     * {@code com.oracle.svm.graal.hotspot.libgraal.Target_org_graalvm_compiler_hotspot_HotSpotGraalRuntime}
+     * to call {@code org.graalvm.nativeimage.VMRuntime.shutdown()}.
+     */
+    private static void shutdownLibGraal() {
     }
 
     void clearMetrics() {

diff --git a/...otspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/HotSpotGraalLibraryFeature.java b/...otspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/HotSpotGraalLibraryFeature.java
@@ -75,6 +75,7 @@
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
+import org.graalvm.nativeimage.VMRuntime;
 import org.graalvm.nativeimage.hosted.Feature;
 import org.graalvm.nativeimage.hosted.RuntimeReflection;
 
@@ -529,6 +530,14 @@ static Object convertUnknownValue(Object object) {
     }
 }
 
+@TargetClass(className = "org.graalvm.compiler.hotspot.HotSpotGraalRuntime", onlyWith = HotSpotGraalLibraryFeature.IsEnabled.class)
+final class Target_org_graalvm_compiler_hotspot_HotSpotGraalRuntime {
+    @Substitute
+    private static void shutdownLibGraal() {
+        VMRuntime.shutdown();
+    }
+}
+
 @TargetClass(className = "org.graalvm.compiler.hotspot.HotSpotGraalOptionValues", onlyWith = HotSpotGraalLibraryFeature.IsEnabled.class)
 final class Target_org_graalvm_compiler_hotspot_HotSpotGraalOptionValues {