Mercurial > hg > truffle

diff src/share/vm/opto/escape.cpp @ 4115:1bd45abaa507

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6890673: Eliminate allocations immediately after EA Summary: Try to eliminate allocations and related locks immediately after escape analysis. Reviewed-by: never
author kvn
date Wed, 16 Nov 2011 09:13:57 -0800
parents 8c57262447d3
children cc81b9c09bbb
line wrap: on
line diff
--- a/src/share/vm/opto/escape.cpp	Wed Nov 16 01:39:50 2011 -0800
+++ b/src/share/vm/opto/escape.cpp	Wed Nov 16 09:13:57 2011 -0800
@@ -1772,12 +1772,20 @@
       Node *n = C->macro_node(i);
       if (n->is_AbstractLock()) { // Lock and Unlock nodes
         AbstractLockNode* alock = n->as_AbstractLock();
-        if (!alock->is_eliminated()) {
+        if (!alock->is_eliminated() || alock->is_coarsened()) {
           PointsToNode::EscapeState es = escape_state(alock->obj_node());
           assert(es != PointsToNode::UnknownEscape, "should know");
           if (es != PointsToNode::UnknownEscape && es != PointsToNode::GlobalEscape) {
-            // Mark it eliminated
-            alock->set_eliminated();
+            if (!alock->is_eliminated()) {
+              // Mark it eliminated to update any counters
+              alock->set_eliminated();
+            } else {
+              // The lock could be marked eliminated by lock coarsening
+              // code during first IGVN before EA. Clear coarsened flag
+              // to eliminate all associated locks/unlocks and relock
+              // during deoptimization.
+              alock->clear_coarsened();
+            }
           }
         }
       }