--- a/graal/GraalCompiler/src/com/sun/c1x/gen/LIRGenerator.java	Tue May 24 12:07:17 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/gen/LIRGenerator.java	Tue May 24 13:39:50 2011 +0200
@@ -1300,15 +1300,16 @@
 
                 List<Phi> phis = getPhis(sux);
 
-                int predIndex = 0;
-                for (; predIndex < sux.numberOfPreds(); ++predIndex) {
-                    if (sux.predAt(predIndex) == bb) {
-                        break;
+                if (phis != null) {
+
+                    int predIndex = 0;
+                    for (; predIndex < sux.numberOfPreds(); ++predIndex) {
+                        if (sux.predAt(predIndex) == bb) {
+                            break;
+                        }
                     }
-                }
-                assert predIndex < sux.numberOfPreds();
+                    assert predIndex < sux.numberOfPreds();
 
-                if (phis != null) {
                     PhiResolver resolver = new PhiResolver(this);
                     for (Phi phi : phis) {
                         if (!phi.isDeadPhi() && phi.valueCount() > predIndex) {
@@ -1328,23 +1329,6 @@
                     }
                     resolver.dispose();
                 }
-
-                /*
-
-                FrameState suxState = sux.stateBefore();
-                TTY.println("number of preds: " + sux.numberOfPreds());
-
-                PhiResolver resolver = new PhiResolver(this);
-
-
-                for (int index = 0; index < suxState.stackSize(); index++) {
-                    moveToPhi(resolver, curState.stackAt(index), suxState.stackAt(index), phis, predIndex);
-                }
-
-                for (int index = 0; index < suxState.localsSize(); index++) {
-                    moveToPhi(resolver, curState.localAt(index), suxState.localAt(index), phis, predIndex);
-                }
-                resolver.dispose();*/
             }
         }
     }