Mercurial > hg > truffle
diff src/share/vm/oops/instanceKlass.cpp @ 997:46b819ba120b
Merge
author | jrose |
---|---|
date | Wed, 30 Sep 2009 13:25:39 -0700 |
parents | 74a5db69c1fe 54b3b351d6f9 |
children | 987e948ebbc8 |
line wrap: on
line diff
--- a/src/share/vm/oops/instanceKlass.cpp Fri Sep 25 04:39:54 2009 -0700 +++ b/src/share/vm/oops/instanceKlass.cpp Wed Sep 30 13:25:39 2009 -0700 @@ -2152,7 +2152,7 @@ // This is a short non-blocking critical region, so the no safepoint check is ok. OsrList_lock->lock_without_safepoint_check(); assert(n->is_osr_method(), "wrong kind of nmethod"); - n->set_link(osr_nmethods_head()); + n->set_osr_link(osr_nmethods_head()); set_osr_nmethods_head(n); // Remember to unlock again OsrList_lock->unlock(); @@ -2168,17 +2168,17 @@ // Search for match while(cur != NULL && cur != n) { last = cur; - cur = cur->link(); + cur = cur->osr_link(); } if (cur == n) { if (last == NULL) { // Remove first element - set_osr_nmethods_head(osr_nmethods_head()->link()); + set_osr_nmethods_head(osr_nmethods_head()->osr_link()); } else { - last->set_link(cur->link()); + last->set_osr_link(cur->osr_link()); } } - n->set_link(NULL); + n->set_osr_link(NULL); // Remember to unlock again OsrList_lock->unlock(); } @@ -2195,7 +2195,7 @@ OsrList_lock->unlock(); return osr; } - osr = osr->link(); + osr = osr->osr_link(); } OsrList_lock->unlock(); return NULL;