Mercurial > hg > graal-compiler
changeset 2962:ef7ceaf48b6f
Phi addInput clean up.
author | Thomas Wuerthinger <thomas@wuerthinger.net> |
---|---|
date | Wed, 15 Jun 2011 12:04:46 +0200 |
parents | 0966a5a904ad |
children | fc66984c2f31 |
files | graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Phi.java graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/value/FrameState.java |
diffstat | 2 files changed, 4 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Phi.java Wed Jun 15 11:55:47 2011 +0200 +++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Phi.java Wed Jun 15 12:04:46 2011 +0200 @@ -129,9 +129,8 @@ return "Phi: (" + str + ")"; } - public Phi addInput(Node y) { + public void addInput(Node y) { inputs().variablePart().add(y); - return this; } public void removeInput(int index) {
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/value/FrameState.java Wed Jun 15 11:55:47 2011 +0200 +++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/value/FrameState.java Wed Jun 15 12:04:46 2011 +0200 @@ -377,22 +377,14 @@ phi = setupPhiForStack(block, i - localsSize); } - Phi originalPhi = phi; if (phi.valueCount() == 0) { int size = block.predecessors().size(); for (int j = 0; j < size; ++j) { - phi = phi.addInput(x); + phi.addInput(x); } - phi = phi.addInput((x == y) ? phi : y); + phi.addInput((x == y) ? phi : y); } else { - phi = phi.addInput((x == y) ? phi : y); - } - if (originalPhi != phi) { - for (int j = 0; j < other.localsSize() + other.stackSize(); ++j) { - if (other.valueAt(j) == originalPhi) { - other.setValueAt(j, phi); - } - } + phi.addInput((x == y) ? phi : y); } if (block instanceof LoopBegin) {