Mercurial > hg > graal-compiler
diff graal/GraalCompiler/src/com/sun/c1x/ir/Phi.java @ 2867:5c545fef2c81
merge
author | Lukas Stadler <lukas.stadler@jku.at> |
---|---|
date | Tue, 07 Jun 2011 16:33:04 +0200 |
parents | 7f14e6b48a9c 14708c03abba |
children |
line wrap: on
line diff
--- a/graal/GraalCompiler/src/com/sun/c1x/ir/Phi.java Tue Jun 07 16:27:08 2011 +0200 +++ b/graal/GraalCompiler/src/com/sun/c1x/ir/Phi.java Tue Jun 07 16:33:04 2011 +0200 @@ -30,7 +30,7 @@ * The {@code Phi} instruction represents the merging of dataflow * in the instruction graph. It refers to a join block and a variable. */ -public final class Phi extends Value { +public final class Phi extends FixedNode { private static final int DEFAULT_MAX_VALUES = 2; @@ -174,7 +174,6 @@ Phi x = new Phi(kind, null, maxValues, into); x.usedInputCount = usedInputCount; x.isDead = isDead; - x.setNonNull(isNonNull()); return x; } }