# HG changeset patch
# User Andreas Woess <andreas.woess@jku.at>
# Date 1408376682 -7200
# Node ID d6c002f4d2a980eb1274ffb24133e763e7634815
# Parent  0d987db807df53d5f52ef3894c2844ab46435847
Truffle: fix NPE with -G:-Inline

diff -r 0d987db807df -r d6c002f4d2a9 graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/HotSpotTruffleRuntime.java
--- a/graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/HotSpotTruffleRuntime.java	Sun Aug 17 14:20:11 2014 +0200
+++ b/graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/HotSpotTruffleRuntime.java	Mon Aug 18 17:44:42 2014 +0200
@@ -231,7 +231,7 @@
         MetaAccessProvider metaAccess = providers.getMetaAccess();
         SuitesProvider suitesProvider = Graal.getRequiredCapability(RuntimeProvider.class).getHostBackend().getSuites();
         Suites suites = suitesProvider.createSuites();
-        suites.getHighTier().findPhase(InliningPhase.class).remove();
+        removeInliningPhase(suites);
         StructuredGraph graph = new StructuredGraph(javaMethod);
         new GraphBuilderPhase.Instance(metaAccess, GraphBuilderConfiguration.getEagerDefault(), OptimisticOptimizations.ALL).apply(graph);
         PhaseSuite<HighTierContext> graphBuilderSuite = suitesProvider.getDefaultGraphBuilderSuite();
@@ -247,6 +247,13 @@
         return runtimeProvider.getHostBackend().getProviders();
     }
 
+    private static void removeInliningPhase(Suites suites) {
+        ListIterator<BasePhase<? super HighTierContext>> inliningPhase = suites.getHighTier().findPhase(InliningPhase.class);
+        if (inliningPhase != null) {
+            inliningPhase.remove();
+        }
+    }
+
     @SlowPath
     @Override
     public <T> T iterateFrames(FrameInstanceVisitor<T> visitor) {