*** old/src/share/vm/opto/runtime.cpp	Tue Oct 20 22:07:02 2009
--- new/src/share/vm/opto/runtime.cpp	Tue Oct 20 22:07:02 2009

*** 1,7 ****
--- 1,7 ----
  /*
!  * Copyright 1998-2007 Sun Microsystems, Inc.  All Rights Reserved.
!  * Copyright 1998-2009 Sun Microsystems, Inc.  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.

*** 854,863 ****
--- 854,866 ----
      }
  
      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.
+     thread->set_is_method_handle_exception(nm->is_method_handle_return(pc));
    }
  
    // Restore correct return pc.  Was saved above.
    thread->set_exception_oop(exception());
    return handler_address;