# HG changeset patch
# User Thomas Wuerthinger <thomas@wuerthinger.net>
# Date 1309537706 -7200
# Node ID acda73820e9b366b0bfb0621d64dc264449c0430
# Parent  5cdaa94cd622ebde4392a717348a4eb8bc23e6ef
Merge fixes.

diff -r 5cdaa94cd622 -r acda73820e9b 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 Jul 01 18:24:04 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/InliningPhase.java	Fri Jul 01 18:28:26 2011 +0200
@@ -173,8 +173,7 @@
                 concrete = profile.types[0].resolveMethodImpl(invoke.target);
                 if (concrete != null && checkTargetConditions(concrete, iterations) && checkSizeConditions(concrete, invoke, profile, ratio)) {
                     IsType isType = new IsType(invoke.receiver(), profile.types[0], compilation.graph);
-                    FixedGuard guard = new FixedGuard(graph);
-                    guard.setNode(isType);
+                    FixedGuard guard = new FixedGuard(isType, graph);
                     assert invoke.predecessors().size() == 1;
                     invoke.predecessors().get(0).successors().replace(invoke, guard);
                     guard.setNext(invoke);
@@ -389,9 +388,7 @@
         assert invoke.predecessors().size() == 1 : "size: " + invoke.predecessors().size();
         FixedNodeWithNext pred;
         if (withReceiver) {
-            FixedGuard clipNode = new FixedGuard(compilation.graph);
-            clipNode.setNode(new IsNonNull(parameters[0], compilation.graph));
-            pred = clipNode;
+            pred = new FixedGuard(new IsNonNull(parameters[0], compilation.graph), compilation.graph);
         } else {
             pred = new Placeholder(compilation.graph);
         }