Mercurial > hg > graal-compiler
changeset 23230:2afef5808af5
Remove NodeIterable#filterInterface.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Fri, 01 Jan 2016 15:20:58 +0100 |
parents | 9c2976c7d96a |
children | abe8b7a5baec |
files | graal/com.oracle.graal.graph/src/com/oracle/graal/graph/iterators/NodeIterable.java graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/StructuredGraph.java graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/PartialEscapePhase.java |
diffstat | 3 files changed, 11 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/iterators/NodeIterable.java Fri Jan 01 15:16:18 2016 +0100 +++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/iterators/NodeIterable.java Fri Jan 01 15:20:58 2016 +0100 @@ -36,10 +36,6 @@ return (NodeIterable<F>) new FilteredNodeIterable<>(this).and(NodePredicates.isA(clazz)); } - default NodeIterable<T> filterInterface(Class<?> iface) { - return new FilteredNodeIterable<>(this).and(NodePredicates.isAInterface(iface)); - } - default FilteredNodeIterable<T> filter(NodePredicate predicate) { return new FilteredNodeIterable<>(this).and(predicate); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/StructuredGraph.java Fri Jan 01 15:16:18 2016 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/StructuredGraph.java Fri Jan 01 15:20:58 2016 +0100 @@ -43,6 +43,7 @@ import com.oracle.graal.graph.spi.SimplifierTool; import com.oracle.graal.nodes.calc.FloatingNode; import com.oracle.graal.nodes.java.MethodCallTargetNode; +import com.oracle.graal.nodes.spi.VirtualizableAllocation; import com.oracle.graal.nodes.util.GraphUtil; /** @@ -609,4 +610,13 @@ } } } + + public final boolean hasVirtualizableAllocation() { + for (Node n : getNodes()) { + if (n instanceof VirtualizableAllocation) { + return true; + } + } + return false; + } }
--- a/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/PartialEscapePhase.java Fri Jan 01 15:16:18 2016 +0100 +++ b/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/PartialEscapePhase.java Fri Jan 01 15:20:58 2016 +0100 @@ -77,7 +77,7 @@ @Override protected void run(StructuredGraph graph, PhaseContext context) { if (VirtualUtil.matches(graph, EscapeAnalyzeOnly.getValue())) { - if (readElimination || graph.getNodes().filterInterface(VirtualizableAllocation.class).isNotEmpty()) { + if (readElimination || graph.hasVirtualizableAllocation()) { runAnalysis(graph, context); } }