--- a/hotspot/src/cpu/x86/vm/c1_FrameMap_x86.cpp	Wed Apr 22 19:10:03 2015 +0300
+++ b/hotspot/src/cpu/x86/vm/c1_FrameMap_x86.cpp	Mon Apr 27 10:49:43 2015 +0200
@@ -343,14 +343,13 @@
   return FrameMap::rsp_opr;
 }
 
-
 // JSR 292
+// On x86, there is no need to save the SP, because neither
+// method handle intrinsics, nor compiled lambda forms modify it.
 LIR_Opr FrameMap::method_handle_invoke_SP_save_opr() {
-  assert(rbp == rbp_mh_SP_save, "must be same register");
-  return rbp_opr;
+  return LIR_OprFact::illegalOpr;
 }
 
-
 bool FrameMap::validate_frame() {
   return true;
 }