Mercurial > hg > truffle
changeset 16553:c9d3d0964adb
proper generic types for CanonicalizerPhase.applyIncremental
author | Lukas Stadler <lukas.stadler@oracle.com> |
---|---|
date | Thu, 17 Jul 2014 14:28:35 +0200 |
parents | f4c7b92a592f |
children | f3c1b2d999da |
files | graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/CanonicalizerPhase.java |
diffstat | 1 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/CanonicalizerPhase.java Thu Jul 17 14:27:57 2014 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/CanonicalizerPhase.java Thu Jul 17 14:28:35 2014 +0200 @@ -88,19 +88,19 @@ * @param workingSet the initial working set of nodes on which the canonicalizer works, should * be an auto-grow node bitmap */ - public void applyIncremental(StructuredGraph graph, PhaseContext context, Iterable<Node> workingSet) { + public void applyIncremental(StructuredGraph graph, PhaseContext context, Iterable<? extends Node> workingSet) { applyIncremental(graph, context, workingSet, true); } - public void applyIncremental(StructuredGraph graph, PhaseContext context, Iterable<Node> workingSet, boolean dumpGraph) { + public void applyIncremental(StructuredGraph graph, PhaseContext context, Iterable<? extends Node> workingSet, boolean dumpGraph) { new Instance(context, canonicalizeReads, workingSet, customCanonicalizer).apply(graph, dumpGraph); } - public void applyIncremental(StructuredGraph graph, PhaseContext context, Iterable<Node> workingSet, Mark newNodesMark) { + public void applyIncremental(StructuredGraph graph, PhaseContext context, Iterable<? extends Node> workingSet, Mark newNodesMark) { applyIncremental(graph, context, workingSet, newNodesMark, true); } - public void applyIncremental(StructuredGraph graph, PhaseContext context, Iterable<Node> workingSet, Mark newNodesMark, boolean dumpGraph) { + public void applyIncremental(StructuredGraph graph, PhaseContext context, Iterable<? extends Node> workingSet, Mark newNodesMark, boolean dumpGraph) { new Instance(context, canonicalizeReads, workingSet, newNodesMark, customCanonicalizer).apply(graph, dumpGraph); } @@ -109,7 +109,7 @@ private final Mark newNodesMark; private final PhaseContext context; private final CustomCanonicalizer customCanonicalizer; - private final Iterable<Node> initWorkingSet; + private final Iterable<? extends Node> initWorkingSet; private final boolean canonicalizeReads; private NodeWorkList workList; @@ -119,7 +119,7 @@ this(context, canonicalizeReads, null, null, customCanonicalizer); } - private Instance(PhaseContext context, boolean canonicalizeReads, Iterable<Node> workingSet, CustomCanonicalizer customCanonicalizer) { + private Instance(PhaseContext context, boolean canonicalizeReads, Iterable<? extends Node> workingSet, CustomCanonicalizer customCanonicalizer) { this(context, canonicalizeReads, workingSet, null, customCanonicalizer); } @@ -127,7 +127,7 @@ this(context, canonicalizeReads, null, newNodesMark, customCanonicalizer); } - private Instance(PhaseContext context, boolean canonicalizeReads, Iterable<Node> workingSet, Mark newNodesMark, CustomCanonicalizer customCanonicalizer) { + private Instance(PhaseContext context, boolean canonicalizeReads, Iterable<? extends Node> workingSet, Mark newNodesMark, CustomCanonicalizer customCanonicalizer) { super("Canonicalizer"); this.newNodesMark = newNodesMark; this.context = context;