Mercurial > hg > graal-compiler
changeset 7079:57d96c2a5950
re-applied changeset d9930fec7553
author | Christian Haeubl <haeubl@ssw.jku.at> |
---|---|
date | Tue, 27 Nov 2012 13:14:30 +0100 |
parents | a43f590e48dd |
children | 15055bdafbfc |
files | graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/InliningUtil.java |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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()); }