Mercurial > hg > graal-jvmci-8

comparison src/share/vm/runtime/thread.cpp @ 23326:b364269cb6cf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revert to explicit exception handling due in scope of an EXCEPTION_MARK
author Doug Simon <doug.simon@oracle.com>
date Fri, 18 Mar 2016 10:50:29 +0100
parents c1935b089c01
children 24505bf61633
comparison
equal deleted inserted replaced
23325:f895a46e0a45 23326:b364269cb6cf
3652 // Compute system loader. Note that this has to occur after set_init_completed, since 3652 // Compute system loader. Note that this has to occur after set_init_completed, since
3653 // valid exceptions may be thrown in the process. 3653 // valid exceptions may be thrown in the process.
3654 // Note that we do not use CHECK_0 here since we are inside an EXCEPTION_MARK and 3654 // Note that we do not use CHECK_0 here since we are inside an EXCEPTION_MARK and
3655 // set_init_completed has just been called, causing exceptions not to be shortcut 3655 // set_init_completed has just been called, causing exceptions not to be shortcut
3656 // anymore. We call vm_exit_during_initialization directly instead. 3656 // anymore. We call vm_exit_during_initialization directly instead.
3657 SystemDictionary::compute_java_system_loader(CHECK_(JNI_ERR)); 3657 SystemDictionary::compute_java_system_loader(THREAD);
3658 if (HAS_PENDING_EXCEPTION) {
3659 vm_exit_during_initialization(Handle(THREAD, PENDING_EXCEPTION));
3660 }
3658 3661
3659 #if INCLUDE_ALL_GCS 3662 #if INCLUDE_ALL_GCS
3660 // Support for ConcurrentMarkSweep. This should be cleaned up 3663 // Support for ConcurrentMarkSweep. This should be cleaned up
3661 // and better encapsulated. The ugly nested if test would go away 3664 // and better encapsulated. The ugly nested if test would go away
3662 // once things are properly refactored. XXX YSR 3665 // once things are properly refactored. XXX YSR