Fix NPEs in full builds

jruby · Mar 5, 2015 · 566a3b6 · 566a3b6
1 parent 699c833
commit 566a3b6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/core/src/main/java/org/jruby/ir/IRScope.java b/core/src/main/java/org/jruby/ir/IRScope.java
@@ -388,6 +388,9 @@ public boolean canReceiveNonlocalReturns() {
     }
 
     public CFG getCFG() {
+        if (getFullInterpreterContext() == null) {
+            prepareFullBuildCommon();
+        }
         return fullInterpreterContext.getCFG();
     }
 

diff --git a/core/src/main/java/org/jruby/ir/passes/LiveVariableAnalysis.java b/core/src/main/java/org/jruby/ir/passes/LiveVariableAnalysis.java
@@ -31,6 +31,10 @@ public String getLabel() {
 
     @Override
     public Object previouslyRun(IRScope scope) {
+        if (scope.getFullInterpreterContext() == null) {
+            scope.prepareFullBuildCommon();
+        }
+
         return scope.getFullInterpreterContext().getDataFlowProblems().get(LiveVariablesProblem.NAME);
     }