--- old/src/share/vm/runtime/vframeArray.cpp	Mon Jul  6 17:13:57 2009
+++ new/src/share/vm/runtime/vframeArray.cpp	Mon Jul  6 17:13:57 2009
@@ -44,6 +44,7 @@
 
   _method = vf->method();
   _bci    = vf->raw_bci();
+  _restart = vf->is_restart();
 
   int index;
 
@@ -155,8 +156,12 @@
     bcp = method()->bcp_from(0); // first byte code
     pc  = Interpreter::deopt_entry(vtos, 0); // step = 0 since we don't skip current bytecode
     use_next_mdp = false;
-  } else {
+  } else if (is_restart()) { // Must restart this instruction according to debuginfo
     bcp = method()->bcp_from(bci());
+    pc  = Interpreter::deopt_entry(vtos, 0);
+    use_next_mdp = false;
+  } else { //some of them may still restart according to Interpreter::continuation_for
+    bcp = method()->bcp_from(bci());
     pc  = Interpreter::continuation_for(method(), bcp, callee_parameters, is_top_frame, use_next_mdp);
   }
   assert(Bytecodes::is_defined(*bcp), "must be a valid bytecode");