Mercurial > hg > graal-jvmci-8
diff src/share/vm/opto/macro.cpp @ 4790:b0ff910edfc9
7128355: assert(!nocreate) failed: Cannot build a phi for a block already parsed
Summary: Do not common BoxLock nodes and avoid creating phis of boxes.
Reviewed-by: never
| author | kvn |
|---|---|
| date | Thu, 12 Jan 2012 14:45:04 -0800 |
| parents | 35acf8f0a2e4 |
| children | 89d0a5d40008 |
line wrap: on
line diff
--- a/src/share/vm/opto/macro.cpp Thu Jan 12 12:28:59 2012 -0800 +++ b/src/share/vm/opto/macro.cpp Thu Jan 12 14:45:04 2012 -0800 @@ -1829,8 +1829,7 @@ // Create new "eliminated" BoxLock node and use it in monitor debug info // instead of oldbox for the same object. - BoxLockNode* box = BoxLockNode::box_node(oldbox); - BoxLockNode* newbox = box->clone()->as_BoxLock(); + BoxLockNode* newbox = oldbox->clone()->as_BoxLock(); // Note: BoxLock node is marked eliminated only here and it is used // to indicate that all associated lock and unlock nodes are marked @@ -2047,7 +2046,7 @@ Node* box = lock->box_node(); Node* flock = lock->fastlock_node(); - assert(!BoxLockNode::box_node(box)->is_eliminated(), "sanity"); + assert(!box->as_BoxLock()->is_eliminated(), "sanity"); // Make the merge point Node *region; @@ -2283,7 +2282,7 @@ Node* obj = unlock->obj_node(); Node* box = unlock->box_node(); - assert(!BoxLockNode::box_node(box)->is_eliminated(), "sanity"); + assert(!box->as_BoxLock()->is_eliminated(), "sanity"); // No need for a null check on unlock