Mercurial > hg > truffle
changeset 4436:cd1e19b72f13
Merge
| author | Gilles Duboscq <duboscq@ssw.jku.at> |
|---|---|
| date | Sat, 04 Feb 2012 11:45:35 +0100 |
| parents | 19fb5eea48b9 (diff) 57cb8ec5f6bb (current diff) |
| children | c7ad6e1e202b |
| files | graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/lir/LIRBlock.java graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/loop/Loop.java graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/loop/LoopInfo.java graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/loop/LoopUtil.java graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/LoweringPhase.java graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/schedule/Block.java graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/schedule/IdentifyBlocksPhase.java graal/com.oracle.max.graal.java/src/com/oracle/max/graal/java/BlockMap.java |
| diffstat | 2 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/InliningPhase.java Fri Feb 03 18:56:09 2012 -0800 +++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/InliningPhase.java Sat Feb 04 11:45:35 2012 +0100 @@ -47,7 +47,7 @@ private final CiTarget target; private final GraalRuntime runtime; - private final Collection<Invoke> hints; + private final Collection<? extends Invoke> hints; private final PriorityQueue<InlineInfo> inlineCandidates = new PriorityQueue<>(); private CiAssumptions assumptions; @@ -58,7 +58,7 @@ private static final DebugMetric metricInliningPerformed = Debug.metric("InliningPerformed"); private static final DebugMetric metricInliningConsidered = Debug.metric("InliningConsidered"); - public InliningPhase(CiTarget target, GraalRuntime runtime, Collection<Invoke> hints, CiAssumptions assumptions, PhasePlan plan) { + public InliningPhase(CiTarget target, GraalRuntime runtime, Collection<? extends Invoke> hints, CiAssumptions assumptions, PhasePlan plan) { this.target = target; this.runtime = runtime; this.hints = hints;
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/LoweringPhase.java Fri Feb 03 18:56:09 2012 -0800 +++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/LoweringPhase.java Sat Feb 04 11:45:35 2012 +0100 @@ -60,6 +60,7 @@ @Override public Node createGuard(Node condition) { + // TODO(tw): Explain why this must not be called on floating nodes. throw new UnsupportedOperationException(); } };