# HG changeset patch
# User Thomas Wuerthinger <thomas@wuerthinger.net>
# Date 1306225635 -7200
# Node ID 3e3338a1abb9eb30eb9767b6af3fb7c713fca410
# Parent  056e392d63d46d1ccd4bccf65cfcfe5a4034823c
Disabled dead phi elimination and phi simplifier.

diff -r 056e392d63d4 -r 3e3338a1abb9 graal/GraalCompiler/src/com/sun/c1x/gen/LIRGenerator.java
--- a/graal/GraalCompiler/src/com/sun/c1x/gen/LIRGenerator.java	Tue May 24 09:49:04 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/gen/LIRGenerator.java	Tue May 24 10:27:15 2011 +0200
@@ -1296,7 +1296,6 @@
 
             // a block with only one predecessor never has phi functions
             if (sux.numberOfPreds() > 1) {
-                FrameState suxState = sux.stateBefore();
 
 
                 List<Phi> phis = getPhis(sux);
@@ -1330,7 +1329,10 @@
                     resolver.dispose();
                 }
 
-                /*TTY.println("number of preds: " + sux.numberOfPreds());
+                /*
+
+                FrameState suxState = sux.stateBefore();
+                TTY.println("number of preds: " + sux.numberOfPreds());
 
                 PhiResolver resolver = new PhiResolver(this);
 
diff -r 056e392d63d4 -r 3e3338a1abb9 graal/GraalCompiler/src/com/sun/c1x/gen/PhiSimplifier.java
--- a/graal/GraalCompiler/src/com/sun/c1x/gen/PhiSimplifier.java	Tue May 24 09:49:04 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/gen/PhiSimplifier.java	Tue May 24 10:27:15 2011 +0200
@@ -31,12 +31,12 @@
  */
 public final class PhiSimplifier {
 
-    public PhiSimplifier(IR ir) {
+    public PhiSimplifier(IR ir) {/*
         for (Node n : ir.compilation.graph.getNodes()) {
             if (n instanceof Phi) {
                 simplify((Phi) n);
             }
-        }
+        }*/
     }
 
     private Value simplify(Value x) {
diff -r 056e392d63d4 -r 3e3338a1abb9 graal/GraalCompiler/src/com/sun/c1x/ir/Phi.java
--- a/graal/GraalCompiler/src/com/sun/c1x/ir/Phi.java	Tue May 24 09:49:04 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/ir/Phi.java	Tue May 24 10:27:15 2011 +0200
@@ -24,9 +24,7 @@
 
 import com.oracle.graal.graph.*;
 import com.sun.c1x.debug.*;
-import com.sun.c1x.value.*;
 import com.sun.cri.ci.*;
-import com.sun.xml.internal.messaging.saaj.packaging.mime.util.*;
 
 /**
  * The {@code Phi} instruction represents the merging of dataflow
diff -r 056e392d63d4 -r 3e3338a1abb9 graal/GraalCompiler/src/com/sun/c1x/value/FrameState.java
--- a/graal/GraalCompiler/src/com/sun/c1x/value/FrameState.java	Tue May 24 09:49:04 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/value/FrameState.java	Tue May 24 10:27:15 2011 +0200
@@ -336,7 +336,7 @@
                         if (x instanceof Phi) {
                             Phi phi = (Phi) x;
                             if (phi.block() == block) {
-                                phi.makeDead();
+                                //phi.makeDead();
                             }
                         }
                         inputs().set(i, null);