Mercurial > hg > graal-compiler
diff 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 |
line wrap: on
line diff
--- a/src/share/vm/interpreter/interpreterRuntime.cpp Tue Jan 15 18:54:02 2013 +0100 +++ b/src/share/vm/interpreter/interpreterRuntime.cpp Wed Jan 16 01:34:24 2013 +0100 @@ -417,7 +417,7 @@ // exception handler lookup KlassHandle h_klass(THREAD, h_exception->klass()); - handler_bci = h_method->fast_exception_handler_bci_for(h_klass, current_bci, THREAD); + handler_bci = Method::fast_exception_handler_bci_for(h_method, h_klass, current_bci, THREAD); if (HAS_PENDING_EXCEPTION) { // We threw an exception while trying to find the exception handler. // Transfer the new exception to the exception handle which will