Mercurial > hg > graal-jvmci-8
changeset 15890:f4510fd9e8b3
Removed unused grow functionality on NodeMap.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Sat, 24 May 2014 13:37:17 +0200 |
parents | 8184c00fefd2 |
children | 079229f002a3 |
files | graal/com.oracle.graal.graph/src/com/oracle/graal/graph/Graph.java graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeMap.java graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeNodeMap.java graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/cfg/ControlFlowGraph.java |
diffstat | 4 files changed, 7 insertions(+), 24 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/Graph.java Fri May 23 17:33:18 2014 -0700 +++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/Graph.java Sat May 24 13:37:17 2014 +0200 @@ -748,11 +748,7 @@ } public <T> NodeMap<T> createNodeMap() { - return createNodeMap(false); - } - - public <T> NodeMap<T> createNodeMap(boolean autoGrow) { - return new NodeMap<>(this, autoGrow); + return new NodeMap<>(this); } public NodeFlood createNodeFlood() {
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeMap.java Fri May 23 17:33:18 2014 -0700 +++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeMap.java Sat May 24 13:37:17 2014 +0200 @@ -28,28 +28,21 @@ public class NodeMap<T> extends NodeIdAccessor { - private final boolean autogrow; protected Object[] values; public NodeMap(Graph graph) { - this(graph, false); - } - - public NodeMap(Graph graph, boolean autogrow) { super(graph); this.values = new Object[graph.nodeIdCount()]; - this.autogrow = autogrow; } public NodeMap(NodeMap<T> copyFrom) { super(copyFrom.graph); this.values = Arrays.copyOf(copyFrom.values, copyFrom.values.length); - this.autogrow = copyFrom.autogrow; } @SuppressWarnings("unchecked") public T get(Node node) { - check(node); + assert check(node); return (T) values[getNodeId(node)]; } @@ -81,7 +74,7 @@ } public void set(Node node, T value) { - check(node); + assert check(node); values[getNodeId(node)] = value; } @@ -93,16 +86,10 @@ return getNodeId(node) >= size(); } - public void grow() { - this.values = Arrays.copyOf(values, graph.nodeIdCount()); - } - - private void check(Node node) { - if (autogrow && isNew(node)) { - grow(); - } + private boolean check(Node node) { assert node.graph() == graph : String.format("%s is not part of the graph", node); assert !isNew(node) : "this node was added to the graph after creating the node map : " + node; + return true; } public void clear() {
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeNodeMap.java Fri May 23 17:33:18 2014 -0700 +++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeNodeMap.java Sat May 24 13:37:17 2014 +0200 @@ -27,7 +27,7 @@ public final class NodeNodeMap extends NodeMap<Node> implements Map<Node, Node> { public NodeNodeMap(Graph graph) { - super(graph, true); + super(graph); } public NodeNodeMap(NodeNodeMap copyFrom) {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/cfg/ControlFlowGraph.java Fri May 23 17:33:18 2014 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/cfg/ControlFlowGraph.java Sat May 24 13:37:17 2014 +0200 @@ -61,7 +61,7 @@ protected ControlFlowGraph(StructuredGraph graph) { this.graph = graph; - this.nodeToBlock = graph.createNodeMap(true); + this.nodeToBlock = graph.createNodeMap(); } public List<Block> getBlocks() {