--- a/hotspot/src/cpu/x86/vm/methodHandles_x86.hpp	Fri Oct 07 13:28:44 2011 +0200
+++ b/hotspot/src/cpu/x86/vm/methodHandles_x86.hpp	Tue Oct 11 02:19:37 2011 -0700
@@ -132,7 +132,10 @@
   intptr_t* sender_link() const         { return _sender_link; }
   address   sender_pc() const           { return _sender_pc; }
 
-  intptr_t* extended_sender_sp() const  { return saved_args_base(); }
+  intptr_t* extended_sender_sp() const {
+    // The extended sender SP is above the current RicochetFrame.
+    return (intptr_t*) (((address) this) + sizeof(RicochetFrame));
+  }
 
   intptr_t  return_value_slot_number() const {
     return adapter_conversion_vminfo(conversion());