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	Mon Jul  6 14:35:47 2009
--- new/src/share/vm/opto/callnode.cpp	Mon Jul  6 14:35:47 2009

*** 221,230 **** --- 221,231 ---- //============================================================================= JVMState::JVMState(ciMethod* method, JVMState* caller) { assert(method != NULL, "must be valid call site"); _method = method; + _restart = false; 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; + _restart = false; 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->_restart != q->_restart) 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"); }
*** 535,544 **** --- 538,548 ---- //--------------------------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_restart(_restart); 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