Mercurial > hg > truffle

comparison src/share/vm/runtime/sharedRuntime.cpp @ 7482:989155e2d07a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with hs25-b15.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Wed, 16 Jan 2013 01:34:24 +0100
parents 291ffc492eb6 0c8717a92b2d
children 5fc51c1ecdeb
comparison
equal deleted inserted replaced
7381:6761a8f854a4 7482:989155e2d07a
662 bool recursive_exception = false; 662 bool recursive_exception = false;
663 do { 663 do {
664 bool skip_scope_increment = false; 664 bool skip_scope_increment = false;
665 // exception handler lookup 665 // exception handler lookup
666 KlassHandle ek (THREAD, exception->klass()); 666 KlassHandle ek (THREAD, exception->klass());
667 handler_bci = sd->method()->fast_exception_handler_bci_for(ek, bci, THREAD); 667 methodHandle mh(THREAD, sd->method());
668 handler_bci = Method::fast_exception_handler_bci_for(mh, ek, bci, THREAD);
668 if (HAS_PENDING_EXCEPTION) { 669 if (HAS_PENDING_EXCEPTION) {
669 recursive_exception = true; 670 recursive_exception = true;
670 // We threw an exception while trying to find the exception handler. 671 // We threw an exception while trying to find the exception handler.
671 // Transfer the new exception to the exception handle which will 672 // Transfer the new exception to the exception handle which will
672 // be set into thread local storage, and do another lookup for an 673 // be set into thread local storage, and do another lookup for an