Mercurial > hg > truffle
changeset 7258:9bee93f61522
Cleanups: remove unused NodeUsagesList.replaceFirst and FrameState.block
Fixes: NodeClassIterator should throw NoSuchElementException, fix FilteredNodeIterable.nonNull
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Tue, 18 Dec 2012 14:28:58 +0100 |
parents | b1ebd583be14 |
children | 494d99e07614 |
files | graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeClass.java graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeUsagesList.java graal/com.oracle.graal.graph/src/com/oracle/graal/graph/iterators/FilteredNodeIterable.java graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FrameState.java |
diffstat | 4 files changed, 2 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeClass.java Tue Dec 18 11:27:12 2012 +0100 +++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeClass.java Tue Dec 18 14:28:58 2012 +0100 @@ -369,7 +369,7 @@ NodeList<Node> list = getNodeList(node, offsets[index]); return list.get(subIndex); } - return null; + throw new NoSuchElementException(); } @Override
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeUsagesList.java Tue Dec 18 11:27:12 2012 +0100 +++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeUsagesList.java Tue Dec 18 14:28:58 2012 +0100 @@ -146,16 +146,6 @@ } } - boolean replaceFirst(Node node, Node other) { - for (int i = 0; i < size; i++) { - if (nodes[i] == node) { - nodes[i] = other; - return true; - } - } - return false; - } - @Override public String toString() { StringBuilder str = new StringBuilder();
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/iterators/FilteredNodeIterable.java Tue Dec 18 11:27:12 2012 +0100 +++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/iterators/FilteredNodeIterable.java Tue Dec 18 14:28:58 2012 +0100 @@ -53,7 +53,7 @@ } @Override public FilteredNodeIterable<T> nonNull() { - this.predicate = this.predicate.or(NodePredicates.isNotNull()); + this.predicate = this.predicate.and(NodePredicates.isNotNull()); return this; } @Override
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FrameState.java Tue Dec 18 11:27:12 2012 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FrameState.java Tue Dec 18 14:28:58 2012 +0100 @@ -298,10 +298,6 @@ return values.get(localsSize + stackSize + i); } - public MergeNode block() { - return usages().filter(MergeNode.class).first(); - } - public NodeIterable<FrameState> innerFrameStates() { return usages().filter(FrameState.class); }