*** old/src/cpu/x86/vm/templateInterpreter_x86_32.cpp	Wed Dec  2 16:26:42 2009
--- new/src/cpu/x86/vm/templateInterpreter_x86_32.cpp	Wed Dec  2 16:26:42 2009

*** 1486,1495 ****
--- 1486,1498 ----
           (moncount*frame::interpreter_frame_monitor_size()) +
           tempcount*Interpreter::stackElementWords() + popframe_extra_args;
  
    if (interpreter_frame != NULL) {
  #ifdef ASSERT
+     if (!EnableMethodHandles)
+       // @@@ FIXME: Should we correct interpreter_frame_sender_sp in the calling sequences?
+       // Probably, since deoptimization doesn't work yet.
        assert(caller->unextended_sp() == interpreter_frame->interpreter_frame_sender_sp(), "Frame not properly walkable");
      assert(caller->sp() == interpreter_frame->sender_sp(), "Frame not properly walkable(2)");
  #endif
  
      interpreter_frame->interpreter_frame_set_method(method);