*** old/src/share/vm/opto/runtime.cpp	Mon Feb 15 19:36:16 2010
--- new/src/share/vm/opto/runtime.cpp	Mon Feb 15 19:36:16 2010

*** 862,872 ****
--- 862,872 ----
  
      thread->set_exception_pc(pc);
      thread->set_exception_handler_pc(handler_address);
      thread->set_exception_stack_size(0);
  
!     // Check if the exception PC is a MethodHandle call site.
      thread->set_is_method_handle_exception(nm->is_method_handle_return(pc));
    }
  
    // Restore correct return pc.  Was saved above.
    thread->set_exception_oop(exception());

*** 950,960 ****
--- 950,960 ----
    }
  #endif
  
    thread->set_vm_result(exception);
    // Frame not compiled (handles deoptimization blob)
!   return SharedRuntime::raw_exception_handler_for_return_address(thread, ret_pc);
  }
  
  
  const TypeFunc *OptoRuntime::rethrow_Type() {
    // create input type (domain)