src/share/vm/runtime/sharedRuntime.cpp

*** 641,651 ****
      bool recursive_exception = false;
      do {
        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);
        if (HAS_PENDING_EXCEPTION) {
          recursive_exception = true;
          // We threw an exception while trying to find the exception handler.
          // Transfer the new exception to the exception handle which will
          // be set into thread local storage, and do another lookup for an
--- 641,652 ----
      bool recursive_exception = false;
      do {
        bool skip_scope_increment = false;
        // exception handler lookup
        KlassHandle ek (THREAD, exception->klass());
!       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.
          // Transfer the new exception to the exception handle which will
          // be set into thread local storage, and do another lookup for an