Mercurial > hg > truffle
changeset 2969:8102d939f4f3
Removed successor tags.
| author | Thomas Wuerthinger <thomas@wuerthinger.net> |
|---|---|
| date | Wed, 15 Jun 2011 16:57:59 +0200 |
| parents | 9133554259c5 |
| children | fe44e684f1cb |
| files | graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/gen/LIRGenerator.java graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/graph/IR.java graal/com.oracle.max.graal.graph/src/com/oracle/max/graal/graph/Node.java graal/com.oracle.max.graal.graph/src/com/oracle/max/graal/graph/NodeArray.java |
| diffstat | 4 files changed, 0 insertions(+), 63 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/gen/LIRGenerator.java Wed Jun 15 16:56:03 2011 +0200 +++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/gen/LIRGenerator.java Wed Jun 15 16:57:59 2011 +0200 @@ -1464,51 +1464,6 @@ } return; } - /* - - assert false : "lastNode=" + lastNode + " instr=" + bb.getInstructions(); - - - - LIRBlock sux = bb.suxAt(0); - assert sux.numberOfPreds() > 0 : "invalid CFG"; - - // a block with only one predecessor never has phi functions - if (sux.numberOfPreds() > 1) { - - - List<Phi> phis = getPhis(sux); - - if (phis != null) { - - int predIndex = 0; - for (; predIndex < sux.numberOfPreds(); ++predIndex) { - if (sux.predAt(predIndex) == bb) { - break; - } - } - assert predIndex < sux.numberOfPreds(); - - PhiResolver resolver = new PhiResolver(this); - for (Phi phi : phis) { - if (!phi.isDead()) { - Value curVal = phi.valueAt(predIndex); - if (curVal != null && curVal != phi) { - if (curVal instanceof Phi) { - operandForPhi((Phi) curVal); - } - CiValue operand = curVal.operand(); - if (operand.isIllegal()) { - assert curVal instanceof Constant || curVal instanceof Local : "these can be produced lazily" + curVal + "/" + phi; - operand = operandForInstruction(curVal); - } - resolver.move(operand, operandForPhi(phi)); - } - } - } - resolver.dispose(); - } - }*/ } }
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/graph/IR.java Wed Jun 15 16:56:03 2011 +0200 +++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/graph/IR.java Wed Jun 15 16:57:59 2011 +0200 @@ -81,17 +81,6 @@ printGraph("After Ininling", compilation.graph); } - // Set successor tags - for (Node n : compilation.graph.getNodes()) { - if (n instanceof Merge) { - for (int i=0; i<n.predecessors().size(); ++i) { - int predIndex = n.predecessorsIndex().get(i); - Node pred = n.predecessors().get(i); - pred.successorTags()[predIndex] = (i + 1); - } - } - } - if (GraalOptions.Time) { GraalTimers.COMPUTE_LINEAR_SCAN_ORDER.start(); }
--- a/graal/com.oracle.max.graal.graph/src/com/oracle/max/graal/graph/Node.java Wed Jun 15 16:56:03 2011 +0200 +++ b/graal/com.oracle.max.graal.graph/src/com/oracle/max/graal/graph/Node.java Wed Jun 15 16:57:59 2011 +0200 @@ -40,7 +40,6 @@ final ArrayList<Node> usages; final ArrayList<Node> predecessors; final ArrayList<Integer> predecessorsIndex; - final int[] successorTags; public Node(int inputCount, int successorCount, Graph graph) { assert graph != null : "cannot create a node for a null graph"; @@ -48,7 +47,6 @@ this.id = graph.register(this); this.inputs = new NodeArray(this, inputCount); this.successors = new NodeArray(this, successorCount); - this.successorTags = new int[successorCount]; this.predecessors = new ArrayList<Node>(); this.usages = new ArrayList<Node>(); this.predecessorsIndex = new ArrayList<Integer>(); @@ -73,10 +71,6 @@ public NodeArray successors() { return successors; } - - public int[] successorTags() { - return successorTags; - } public int id() { return id;
--- a/graal/com.oracle.max.graal.graph/src/com/oracle/max/graal/graph/NodeArray.java Wed Jun 15 16:56:03 2011 +0200 +++ b/graal/com.oracle.max.graal.graph/src/com/oracle/max/graal/graph/NodeArray.java Wed Jun 15 16:57:59 2011 +0200 @@ -229,7 +229,6 @@ assert !self().isDeleted() : "trying to setAndClear successor of deleted node: " + self().shortName(); assert self().successors == this; Node value = clearedNode.successors.get(clearedIndex); - self().successorTags[index] = clearedNode.successorTags[clearedIndex]; assert value != Node.Null : "cannot clear null value"; clearedNode.successors.nodes[clearedIndex] = Node.Null; set(index, Node.Null);