Mercurial > hg > graal-compiler
diff graal/GraalCompiler/src/com/sun/c1x/gen/LIRGenerator.java @ 2826:d54ea877a302
Merge
author | Gilles Duboscq <gilles.duboscq@oracle.com> |
---|---|
date | Mon, 30 May 2011 18:02:55 +0200 |
parents | 9ba6a8abe894 015be60afcf3 |
children | 1cd59ca9ac86 bfce42cd9c07 caf55daa41dc |
line wrap: on
line diff
--- a/graal/GraalCompiler/src/com/sun/c1x/gen/LIRGenerator.java Mon May 30 18:01:32 2011 +0200 +++ b/graal/GraalCompiler/src/com/sun/c1x/gen/LIRGenerator.java Mon May 30 18:02:55 2011 +0200 @@ -1280,7 +1280,7 @@ Phi phi = (Phi) suxVal; // curVal can be null without phi being null in conjunction with inlining - if (!phi.isDeadPhi() && curVal != null && curVal != phi) { + if (!phi.isDead() && curVal != null && curVal != phi) { assert phis.contains(phi); if (phi.valueAt(predIndex) != curVal) { @@ -1288,7 +1288,7 @@ } assert phi.valueAt(predIndex) == curVal : "curVal=" + curVal + "valueAt(" + predIndex + ")=" + phi.valueAt(predIndex); - assert !phi.isIllegal() : "illegal phi cannot be marked as live"; + assert !phi.isDead() : "illegal phi cannot be marked as live"; if (curVal instanceof Phi) { operandForPhi((Phi) curVal); } @@ -1343,7 +1343,7 @@ PhiResolver resolver = new PhiResolver(this); for (Phi phi : phis) { - if (!phi.isDeadPhi()) { + if (!phi.isDead()) { Value curVal = phi.valueAt(predIndex); if (curVal != null && curVal != phi) { if (curVal instanceof Phi) { @@ -1389,7 +1389,7 @@ } private CiValue operandForPhi(Phi phi) { - assert !phi.isDeadPhi(); + assert !phi.isDead(); if (phi.operand().isIllegal()) { // allocate a variable for this phi CiVariable operand = newVariable(phi.kind); @@ -1459,7 +1459,7 @@ for (int index = 0; index < state.localsSize(); index++) { final Value value = state.localAt(index); if (value != null) { - if (!value.isIllegal()) { + if (!(value instanceof Phi && ((Phi) value).isDead())) { walkStateValue(value); } } @@ -1468,7 +1468,7 @@ private void walkStateValue(Value value) { if (value != null) { - if (value instanceof Phi && !value.isIllegal()) { + if (value instanceof Phi && !((Phi) value).isDead()) { // phi's are special operandForPhi((Phi) value); } else if (value.operand().isIllegal()) {