# HG changeset patch
# User Christian Haeubl <haeubl@ssw.jku.at>
# Date 1354018470 -3600
# Node ID 57d96c2a5950f1fab9ce5c3263a7e729ab9727e7
# Parent  a43f590e48dd603db0aaeae5b99c16218870519d
re-applied changeset d9930fec7553

diff -r a43f590e48dd -r 57d96c2a5950 graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/InliningUtil.java
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/InliningUtil.java	Tue Nov 27 13:02:43 2012 +0100
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/InliningUtil.java	Tue Nov 27 13:14:30 2012 +0100
@@ -991,7 +991,7 @@
         assert invoke.node().isAlive();
 
         StructuredGraph intrinsicGraph = (StructuredGraph) target.getCompilerStorage().get(Graph.class);
-        if (intrinsicGraph == null) {
+        if (intrinsicGraph == null && runtime != null) {
             // TODO remove once all intrinsics are available via compilerStorage
             intrinsicGraph = runtime.intrinsicGraph(invoke.stateAfter().method(), invoke.bci(), target, invoke.callTarget().arguments());
         }