Mercurial > hg > graal-compiler
comparison src/share/vm/interpreter/interpreterRuntime.cpp @ 7482:989155e2d07a
Merge with hs25-b15.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Wed, 16 Jan 2013 01:34:24 +0100 |
parents | 291ffc492eb6 0c8717a92b2d |
children | d343737786fe |
comparison
equal
deleted
inserted
replaced
7381:6761a8f854a4 | 7482:989155e2d07a |
---|---|
415 // for AbortVMOnException flag | 415 // for AbortVMOnException flag |
416 NOT_PRODUCT(Exceptions::debug_check_abort(h_exception)); | 416 NOT_PRODUCT(Exceptions::debug_check_abort(h_exception)); |
417 | 417 |
418 // exception handler lookup | 418 // exception handler lookup |
419 KlassHandle h_klass(THREAD, h_exception->klass()); | 419 KlassHandle h_klass(THREAD, h_exception->klass()); |
420 handler_bci = h_method->fast_exception_handler_bci_for(h_klass, current_bci, THREAD); | 420 handler_bci = Method::fast_exception_handler_bci_for(h_method, h_klass, current_bci, THREAD); |
421 if (HAS_PENDING_EXCEPTION) { | 421 if (HAS_PENDING_EXCEPTION) { |
422 // We threw an exception while trying to find the exception handler. | 422 // We threw an exception while trying to find the exception handler. |
423 // Transfer the new exception to the exception handle which will | 423 // Transfer the new exception to the exception handle which will |
424 // be set into thread local storage, and do another lookup for an | 424 // be set into thread local storage, and do another lookup for an |
425 // exception handler for this exception, this time starting at the | 425 // exception handler for this exception, this time starting at the |