changeset 4659:bb90e461a139

Cosmetic changes to lock elimination.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Tue, 21 Feb 2012 15:57:18 +0100
parents f6eee9c543fc
children b06ade6e927c
files graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/gen/LIRGenerator.java graal/com.oracle.max.graal.nodes/src/com/oracle/max/graal/nodes/java/AccessMonitorNode.java graal/com.oracle.max.graal.nodes/src/com/oracle/max/graal/nodes/spi/EscapeOp.java
diffstat 3 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/gen/LIRGenerator.java	Tue Feb 21 13:15:07 2012 +0100
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/gen/LIRGenerator.java	Tue Feb 21 15:57:18 2012 +0100
@@ -95,7 +95,7 @@
          * The frame state of the caller of the method performing the lock, or null if the outermost method
          * performs the lock. This information is used to compute the {@link CiFrame} that this lock belongs to.
          * We cannot use the actual frame state of the locking method, because it is now unique for a method. The
-         * caller frame states are unique, i.e., all frame states of an inlined methods refer to the same caller frame state.
+         * caller frame states are unique, i.e., all frame states of inlined methods refer to the same caller frame state.
          */
         public final FrameState callerState;
 
--- a/graal/com.oracle.max.graal.nodes/src/com/oracle/max/graal/nodes/java/AccessMonitorNode.java	Tue Feb 21 13:15:07 2012 +0100
+++ b/graal/com.oracle.max.graal.nodes/src/com/oracle/max/graal/nodes/java/AccessMonitorNode.java	Tue Feb 21 15:57:18 2012 +0100
@@ -56,7 +56,7 @@
         return eliminated;
     }
 
-    public void makeEliminated() {
+    public void eliminate() {
         eliminated = true;
     }
 
--- a/graal/com.oracle.max.graal.nodes/src/com/oracle/max/graal/nodes/spi/EscapeOp.java	Tue Feb 21 13:15:07 2012 +0100
+++ b/graal/com.oracle.max.graal.nodes/src/com/oracle/max/graal/nodes/spi/EscapeOp.java	Tue Feb 21 15:57:18 2012 +0100
@@ -108,7 +108,7 @@
             assert x.type() == ((ValueNode) node).exactType();
             ((StructuredGraph) x.graph()).replaceFloating(x, ConstantNode.forBoolean(true, node.graph()));
         } else if (usage instanceof AccessMonitorNode) {
-            ((AccessMonitorNode) usage).makeEliminated();
+            ((AccessMonitorNode) usage).eliminate();
         }
     }