Mercurial > hg > graal-compiler
changeset 3129:acda73820e9b
Merge fixes.
author | Thomas Wuerthinger <thomas@wuerthinger.net> |
---|---|
date | Fri, 01 Jul 2011 18:28:26 +0200 |
parents | 5cdaa94cd622 |
children | a4b0c3df7f80 |
files | graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/InliningPhase.java |
diffstat | 1 files changed, 2 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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); }