# HG changeset patch # User Bernhard Urban # Date 1411589105 -7200 # Node ID 873f082901c8768a722db0ba890d220ef042a949 # Parent fcf71ef8a0e5e07901f0e5215be43acbb359b2c9 unittest: fix NPE if inlining is disabled diff -r fcf71ef8a0e5 -r 873f082901c8 graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraalCompilerTest.java --- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraalCompilerTest.java Wed Sep 24 18:42:50 2014 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraalCompilerTest.java Wed Sep 24 22:05:05 2014 +0200 @@ -54,7 +54,6 @@ import com.oracle.graal.nodes.virtual.*; import com.oracle.graal.phases.*; import com.oracle.graal.phases.common.*; -import com.oracle.graal.phases.common.inlining.*; import com.oracle.graal.phases.schedule.*; import com.oracle.graal.phases.tiers.*; import com.oracle.graal.phases.util.*; @@ -125,7 +124,7 @@ protected Suites createSuites() { Suites ret = backend.getSuites().createSuites(); - ListIterator> iter = ret.getHighTier().findPhase(InliningPhase.class); + ListIterator> iter = ret.getHighTier().findPhase(CleanTypeProfileProxyPhase.class); PhaseSuite.findNextPhase(iter, CanonicalizerPhase.class); iter.add(new Phase("ComputeLoopFrequenciesPhase") {