# HG changeset patch
# User Lukas Stadler <lukas.stadler@jku.at>
# Date 1374146197 -7200
# Node ID f272fe8a2f9a3ea74236693ca4e5a40efef64bfa
# Parent  842166781ddb8427e70ddee2ac14792ad2c16932
move LockElimination to MidTier

diff -r 842166781ddb -r f272fe8a2f9a graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/HighTier.java
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/HighTier.java	Thu Jul 18 13:15:07 2013 +0200
+++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/HighTier.java	Thu Jul 18 13:16:37 2013 +0200
@@ -52,8 +52,6 @@
             appendPhase(new ConvertDeoptimizeToGuardPhase());
         }
 
-        appendPhase(new LockEliminationPhase());
-
         if (OptLoopTransform.getValue()) {
             appendPhase(new LoopTransformHighPhase());
             appendPhase(new LoopTransformLowPhase());
diff -r 842166781ddb -r f272fe8a2f9a graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/MidTier.java
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/MidTier.java	Thu Jul 18 13:15:07 2013 +0200
+++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/MidTier.java	Thu Jul 18 13:16:37 2013 +0200
@@ -42,6 +42,8 @@
             appendPhase(canonicalizer);
         }
 
+        appendPhase(new LockEliminationPhase());
+
         if (OptFloatingReads.getValue()) {
             IncrementalCanonicalizerPhase<MidTierContext> incCanonicalizer = new IncrementalCanonicalizerPhase<>();
             incCanonicalizer.appendPhase(new FloatingReadPhase());