diff src/share/vm/runtime/java.cpp @ 23408:f84a5ac3be22

make JVMCI JDK immutable and sharable among different JVMCI clients minimize diff to jvmci-9, including adding support for EnableJVMCI (default is true in jvmci-8)
author Doug Simon <doug.simon@oracle.com>
date Mon, 30 May 2016 22:56:59 +0200
parents 3ef45d0a6d77
children f13e777eb255
line wrap: on
line diff
--- a/src/share/vm/runtime/java.cpp	Mon May 30 14:11:39 2016 +0200
+++ b/src/share/vm/runtime/java.cpp	Mon May 30 22:56:59 2016 +0200
@@ -491,7 +491,16 @@
   }
 
 #if INCLUDE_JVMCI
-  JVMCIRuntime::shutdown();
+  // We are not using CATCH here because we want the exit to continue normally.
+  Thread* THREAD = thread;
+  JVMCIRuntime::shutdown(THREAD);
+  if (HAS_PENDING_EXCEPTION) {
+    Handle exception(THREAD, PENDING_EXCEPTION);
+    CLEAR_PENDING_EXCEPTION;
+    java_lang_Throwable::print(exception, tty);
+    tty->cr();
+    java_lang_Throwable::print_stack_trace(exception(), tty);
+  }
 #endif
 
   // The only difference between this and Win32's _onexit procs is that