# HG changeset patch
# User Gilles Duboscq <duboscq@ssw.jku.at>
# Date 1328352335 -3600
# Node ID cd1e19b72f138654b316c53965e34e067bd2f060
# Parent  19fb5eea48b9450b0f7f795c230866494ce75b1c# Parent  57cb8ec5f6bb04f1f33d7c552813a66db9e9d199
Merge

diff -r 57cb8ec5f6bb -r cd1e19b72f13 graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/InliningPhase.java
--- 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;
diff -r 57cb8ec5f6bb -r cd1e19b72f13 graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/LoweringPhase.java
--- 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();
             }
         };