Mercurial > hg > truffle

changeset 16427:84a14e69fa8b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
added missing check for pending exception
author Doug Simon <doug.simon@oracle.com>
date Tue, 08 Jul 2014 21:35:46 +0200
parents 775660e1acbc
children 78ddecd6255f
files src/share/vm/runtime/thread.cpp
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/runtime/thread.cpp	Tue Jul 08 21:29:13 2014 +0200
+++ b/src/share/vm/runtime/thread.cpp	Tue Jul 08 21:35:46 2014 +0200
@@ -3679,7 +3679,9 @@
   // anymore. We call vm_exit_during_initialization directly instead.
   SystemDictionary::compute_java_system_loader(THREAD);
 #ifdef GRAAL
-  SystemDictionary::initialize_preloaded_graal_classes(THREAD);
+  if (!HAS_PENDING_EXCEPTION) {
+    SystemDictionary::initialize_preloaded_graal_classes(THREAD);
+  }
 #endif
   if (HAS_PENDING_EXCEPTION) {
     vm_exit_during_initialization(Handle(THREAD, PENDING_EXCEPTION));