Mercurial > hg > graal-compiler
diff src/share/vm/runtime/sharedRuntime.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 | 5fc51c1ecdeb |
line wrap: on
line diff
--- a/src/share/vm/runtime/sharedRuntime.cpp Tue Jan 15 18:54:02 2013 +0100 +++ b/src/share/vm/runtime/sharedRuntime.cpp Wed Jan 16 01:34:24 2013 +0100 @@ -664,7 +664,8 @@ bool skip_scope_increment = false; // exception handler lookup KlassHandle ek (THREAD, exception->klass()); - handler_bci = sd->method()->fast_exception_handler_bci_for(ek, bci, THREAD); + methodHandle mh(THREAD, sd->method()); + handler_bci = Method::fast_exception_handler_bci_for(mh, ek, bci, THREAD); if (HAS_PENDING_EXCEPTION) { recursive_exception = true; // We threw an exception while trying to find the exception handler.