Mercurial > hg > graal-compiler

changeset 23031:2c730119cb92

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed race in inlining visitor.
author Christian Humer <christian.humer@oracle.com>
date Thu, 19 Nov 2015 18:01:10 +0100
parents 183221119491
children 73fa2bf51eaa
files graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleInlining.java
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleInlining.java	Thu Nov 19 17:20:38 2015 +0100
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleInlining.java	Thu Nov 19 18:01:10 2015 +0100
@@ -296,7 +296,7 @@
                 return;
             }
             TruffleInliningDecision decision = currentDecision.findByCall((OptimizedDirectCallNode) node);
-            if (decision.isInline()) {
+            if (decision != null && decision.isInline()) {
                 inliningDecisionStack.add(decision);
                 iteratorStack.add(NodeUtil.makeRecursiveIterator(decision.getTarget().getRootNode()));
             }