Mercurial > hg > truffle

changeset 5832:f489b0c20b56

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revert mistakenly commited FloatingRead phase changes
author Gilles Duboscq <duboscq@ssw.jku.at>
date Fri, 13 Jul 2012 15:31:53 +0200
parents ed08c40d67de
children 2a9fda4f9f1e
files graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java
diffstat 1 files changed, 9 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java	Fri Jul 13 14:10:02 2012 +0200
+++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java	Fri Jul 13 15:31:53 2012 +0200
@@ -181,14 +181,12 @@
             new CullFrameStatesPhase().apply(graph);
         }
 
-        if (GraalOptions.FloatingReads) {
-            Debug.dump(graph, "Before floating read");
-            int mark = graph.getMark();
-            new FloatingRead2Phase().apply(graph);
-            new CanonicalizerPhase(target, runtime, assumptions, mark, null).apply(graph);
-            if (GraalOptions.OptReadElimination) {
-                new ReadEliminationPhase().apply(graph);
-            }
+        new FloatingReadPhase().apply(graph);
+        if (GraalOptions.OptGVN) {
+            new GlobalValueNumberingPhase().apply(graph);
+        }
+        if (GraalOptions.OptReadElimination) {
+            new ReadEliminationPhase().apply(graph);
         }
 
         if (GraalOptions.PropagateTypes) {
@@ -201,6 +199,9 @@
         if (GraalOptions.OptCanonicalizer) {
             new CanonicalizerPhase(target, runtime, assumptions).apply(graph);
         }
+        if (GraalOptions.OptCanonicalizer) {
+            new CanonicalizerPhase(target, runtime, assumptions).apply(graph);
+        }
 
         if (GraalOptions.OptLoopTransform) {
             new LoopTransformLowPhase().apply(graph);