# HG changeset patch # User Thomas Wuerthinger # Date 1329836238 -3600 # Node ID bb90e461a1395cdccec0ab9a0cdf2f4e1114762d # Parent f6eee9c543fcae78216ac5f31f83906cdcee6909 Cosmetic changes to lock elimination. diff -r f6eee9c543fc -r bb90e461a139 graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/gen/LIRGenerator.java --- 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; diff -r f6eee9c543fc -r bb90e461a139 graal/com.oracle.max.graal.nodes/src/com/oracle/max/graal/nodes/java/AccessMonitorNode.java --- 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; } diff -r f6eee9c543fc -r bb90e461a139 graal/com.oracle.max.graal.nodes/src/com/oracle/max/graal/nodes/spi/EscapeOp.java --- 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(); } }