*** old/src/cpu/x86/vm/methodHandles_x86.cpp	Thu Sep 26 20:07:32 2013
--- new/src/cpu/x86/vm/methodHandles_x86.cpp	Thu Sep 26 20:07:32 2013

*** 1,7 ****
--- 1,7 ----
  /*
!  * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
!  * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.

*** 112,121 ****
--- 112,126 ----
  #endif //ASSERT
  
  void MethodHandles::jump_from_method_handle(MacroAssembler* _masm, Register method, Register temp,
                                              bool for_compiler_entry) {
    assert(method == rbx, "interpreter calling convention");
+ 
+    Label L_no_such_method;
+    __ testptr(rbx, rbx);
+    __ jcc(Assembler::zero, L_no_such_method);
+ 
    __ verify_method_ptr(method);
  
    if (!for_compiler_entry && JvmtiExport::can_post_interpreter_events()) {
      Label run_compiled_code;
      // JVMTI events, such as single-stepping, are implemented partly by avoiding running

*** 136,145 ****
--- 141,153 ----
    }
  
    const ByteSize entry_offset = for_compiler_entry ? Method::from_compiled_offset() :
                                                       Method::from_interpreted_offset();
    __ jmp(Address(method, entry_offset));
+ 
+   __ bind(L_no_such_method);
+   __ jump(RuntimeAddress(StubRoutines::throw_AbstractMethodError_entry()));
  }
  
  void MethodHandles::jump_to_lambda_form(MacroAssembler* _masm,
                                          Register recv, Register method_temp,
                                          Register temp2,