Mercurial > hg > truffle

diff graal/GraalCompiler/src/com/sun/c1x/value/FrameState.java @ 2769:dd6419f4bfe2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed several issues with incorrect predecessor count/order. One known issue around exception dispatch remaining in fop.
author Thomas Wuerthinger <thomas@wuerthinger.net>
date Mon, 23 May 2011 21:21:47 +0200
parents 43ffa0e47a46
children 3e3338a1abb9
line wrap: on
line diff
--- a/graal/GraalCompiler/src/com/sun/c1x/value/FrameState.java	Mon May 23 19:21:53 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/value/FrameState.java	Mon May 23 21:21:47 2011 +0200
@@ -364,15 +364,15 @@
                     } else {
                         phi = phi.addInput((x == y) ? phi : y);
                     }
-                    /*if (originalPhi != phi) {
+                    if (originalPhi != phi) {
                         for (int j = 0; j < other.localsSize() + other.stackSize(); ++j) {
                             if (other.valueAt(j) == originalPhi) {
                                 other.setValueAt(j, phi);
                             }
                         }
-                    }*/
+                    }
 
-                    //assert phi.valueCount() == block.predecessors().size() + (blockAppended ? 0 : 1) : "valueCount=" + phi.valueCount() + " predSize= " + block.predecessors().size();
+                    assert phi.valueCount() == block.predecessors().size() + (blockAppended ? 0 : 1) : "valueCount=" + phi.valueCount() + " predSize= " + block.predecessors().size();
                }
             }
         }