src/share/vm/opto/callnode.cpp
Index Unified diffs Context diffs Sdiffs Wdiffs Patch New Old Previous File Next File
*** old/src/share/vm/opto/callnode.cpp	Tue Jul 21 15:54:26 2009
--- new/src/share/vm/opto/callnode.cpp	Tue Jul 21 15:54:26 2009

*** 221,230 **** --- 221,231 ---- //============================================================================= JVMState::JVMState(ciMethod* method, JVMState* caller) { assert(method != NULL, "must be valid call site"); _method = method; + _reexecute = RE_Undefined; debug_only(_bci = -99); // random garbage value debug_only(_map = (SafePointNode*)-1); _caller = caller; _depth = 1 + (caller == NULL ? 0 : caller->depth()); _locoff = TypeFunc::Parms;
*** 235,244 **** --- 236,246 ---- _sp = 0; } JVMState::JVMState(int stack_size) { _method = NULL; _bci = InvocationEntryBci; + _reexecute = RE_Undefined; debug_only(_map = (SafePointNode*)-1); _caller = NULL; _depth = 1; _locoff = TypeFunc::Parms; _stkoff = _locoff;
*** 267,276 **** --- 269,279 ---- const JVMState* q = that; for (;;) { if (p->_method != q->_method) return false; if (p->_method == NULL) return true; // bci is irrelevant if (p->_bci != q->_bci) return false; + if (p->_reexecute != q->_reexecute) return false; p = p->caller(); q = q->caller(); if (p == q) return true; assert(p != NULL && q != NULL, "depth check ensures we don't run off end"); }
*** 488,497 **** --- 491,501 ---- } } if (!printed) _method->print_short_name(st); st->print(" @ bci:%d",_bci); + st->print(" reexecute:%s", _reexecute==RE_True?"true":"false"); } else { st->print(" runtime stub"); } if (caller() != NULL) caller()->dump_spec(st); }
*** 507,518 **** --- 511,522 ---- ex->dump(1); } } _map->dump(2); } ! st->print("JVMS depth=%d loc=%d stk=%d mon=%d scalar=%d end=%d mondepth=%d sp=%d bci=%d reexecute=%s method=", ! depth(), locoff(), stkoff(), monoff(), scloff(), endoff(), monitor_depth(), sp(), bci(), should_reexecute()==RE_True?"true":"false"); if (_method == NULL) { st->print_cr("(none)"); } else { _method->print_name(st); st->cr();
*** 535,544 **** --- 539,549 ---- //--------------------------clone_shallow-------------------------------------- JVMState* JVMState::clone_shallow(Compile* C) const { JVMState* n = has_method() ? new (C) JVMState(_method, _caller) : new (C) JVMState(0); n->set_bci(_bci); + n->set_reexecute(_reexecute); n->set_locoff(_locoff); n->set_stkoff(_stkoff); n->set_monoff(_monoff); n->set_scloff(_scloff); n->set_endoff(_endoff);

src/share/vm/opto/callnode.cpp
Index Unified diffs Context diffs Sdiffs Wdiffs Patch New Old Previous File Next File