Mercurial > hg > truffle
changeset 18966:1eeef8016b86
Do not provide full schedul to LoweringTool.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Tue, 27 Jan 2015 11:58:50 +0100 |
parents | 53fcb13db742 |
children | 2adb5310a2f5 |
files | graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/LoweringTool.java graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/LoweringPhase.java |
diffstat | 2 files changed, 2 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/LoweringTool.java Tue Jan 27 11:47:44 2015 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/LoweringTool.java Tue Jan 27 11:58:50 2015 +0100 @@ -24,9 +24,7 @@ import com.oracle.graal.api.code.*; import com.oracle.graal.api.meta.*; -import com.oracle.graal.graph.*; import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.cfg.*; import com.oracle.graal.nodes.extended.*; public interface LoweringTool { @@ -47,8 +45,6 @@ Assumptions assumptions(); - Block getBlockFor(Node node); - /** * Gets the closest fixed node preceding the node currently being lowered. */
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/LoweringPhase.java Tue Jan 27 11:47:44 2015 +0100 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/LoweringPhase.java Tue Jan 27 11:58:50 2015 +0100 @@ -77,14 +77,12 @@ private final NodeBitMap activeGuards; private AnchoringNode guardAnchor; private FixedWithNextNode lastFixedNode; - private ControlFlowGraph cfg; - public LoweringToolImpl(PhaseContext context, AnchoringNode guardAnchor, NodeBitMap activeGuards, FixedWithNextNode lastFixedNode, ControlFlowGraph cfg) { + public LoweringToolImpl(PhaseContext context, AnchoringNode guardAnchor, NodeBitMap activeGuards, FixedWithNextNode lastFixedNode) { this.context = context; this.guardAnchor = guardAnchor; this.activeGuards = activeGuards; this.lastFixedNode = lastFixedNode; - this.cfg = cfg; } @Override @@ -158,11 +156,6 @@ } } - @Override - public Block getBlockFor(Node node) { - return cfg.blockFor(node); - } - public FixedWithNextNode lastFixedNode() { return lastFixedNode; } @@ -298,7 +291,7 @@ private AnchoringNode process(final Block b, final NodeBitMap activeGuards, final AnchoringNode startAnchor) { - final LoweringToolImpl loweringTool = new LoweringToolImpl(context, startAnchor, activeGuards, b.getBeginNode(), schedule.getCFG()); + final LoweringToolImpl loweringTool = new LoweringToolImpl(context, startAnchor, activeGuards, b.getBeginNode()); // Lower the instructions of this block. List<ValueNode> nodes = schedule.nodesFor(b);