[GR-44821] Check for native frames in DestroyJavaVM.

PullRequest: graal/14103
guizmaii · Mar 21, 2023 · e9893c0 · e9893c0
2 parents efcb517 + 70d5b78
commit e9893c0
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/...src/com.oracle.svm.core/src/com/oracle/svm/core/jni/functions/JNIInvocationInterface.java b/...src/com.oracle.svm.core/src/com/oracle/svm/core/jni/functions/JNIInvocationInterface.java
@@ -76,6 +76,7 @@
 import com.oracle.svm.core.monitor.MonitorInflationCause;
 import com.oracle.svm.core.monitor.MonitorSupport;
 import com.oracle.svm.core.snippets.ImplicitExceptions;
+import com.oracle.svm.core.stack.JavaFrameAnchors;
 import com.oracle.svm.core.thread.PlatformThreads;
 import com.oracle.svm.core.util.Utf8;
 
@@ -280,6 +281,9 @@ static int DetachCurrentThread(@SuppressWarnings("unused") JNIJavaVM vm) {
     @CEntryPointOptions(prologue = JNIJavaVMEnterAttachThreadEnsureJavaThreadPrologue.class, epilogue = LeaveTearDownIsolateEpilogue.class)
     @SuppressWarnings("unused")
     static int DestroyJavaVM(JNIJavaVM vm) {
+        if (JavaFrameAnchors.getFrameAnchor().isNonNull()) {
+            return JNIErrors.JNI_ERR();
+        }
         PlatformThreads.singleton().joinAllNonDaemons();
         return JNIErrors.JNI_OK();
     }