jruby · Mar 5, 2015 · Mar 5, 2015
diff --git a/core/src/main/java/org/jruby/ir/IRScope.java b/core/src/main/java/org/jruby/ir/IRScope.java
@@ -3,9 +3,8 @@
 import org.jruby.ParseResult;
 import org.jruby.RubyInstanceConfig;
 import org.jruby.RubyModule;
-import org.jruby.ir.dataflow.DataFlowProblem;
 import org.jruby.ir.dataflow.analyses.LiveVariablesProblem;
-import org.jruby.ir.dataflow.analyses.UnboxableOpsAnalysisNode;
+import org.jruby.ir.dataflow.analyses.StoreLocalVarPlacementProblem;
 import org.jruby.ir.dataflow.analyses.UnboxableOpsAnalysisProblem;
 import org.jruby.ir.instructions.*;
 import org.jruby.ir.interpreter.FullInterpreterContext;
@@ -407,6 +406,22 @@ public LiveVariablesProblem getLiveVariablesProblem() {
         return (LiveVariablesProblem) fullInterpreterContext.getDataFlowProblems().get(LiveVariablesProblem.NAME);
     }
 
+    public void putStoreLocalVarPlacementProblem(StoreLocalVarPlacementProblem problem) {
+        // Technically this is if a pass is invalidated which has never run on a scope with no CFG/FIC yet.
+        if (fullInterpreterContext == null) {
+            // This should never trigger unless we got sloppy
+            if (problem != null) throw new IllegalStateException("StoreLocalVarPlacementProblem being stored when no FIC");
+            return;
+        }
+        fullInterpreterContext.getDataFlowProblems().put(StoreLocalVarPlacementProblem.NAME, problem);
+    }
+
+    public StoreLocalVarPlacementProblem getStoreLocalVarPlacementProblem() {
+        if (fullInterpreterContext == null) return null; // no fic so no pass-related info
+
+        return (StoreLocalVarPlacementProblem) fullInterpreterContext.getDataFlowProblems().get(UnboxableOpsAnalysisProblem.NAME);
+    }
+
     public void putUnboxableOpsAnalysisProblem(UnboxableOpsAnalysisProblem problem) {
         // Technically this is if a pass is invalidated which has never run on a scope with no CFG/FIC yet.
         if (fullInterpreterContext == null) {

diff --git a/core/src/main/java/org/jruby/ir/passes/AddCallProtocolInstructions.java b/core/src/main/java/org/jruby/ir/passes/AddCallProtocolInstructions.java
@@ -8,8 +8,6 @@
 import org.jruby.ir.representations.BasicBlock;
 import org.jruby.ir.representations.CFG;
 
-import java.util.Arrays;
-import java.util.List;
 import java.util.ListIterator;
 
 public class AddCallProtocolInstructions extends CompilerPass {
@@ -32,7 +30,7 @@ public Object execute(IRScope scope, Object... data) {
         // If the scope uses $_ or $~ family of vars, has local load/stores, or if its binding has escaped, we have
         // to allocate a dynamic scope for it and add binding push/pop instructions.
         if (explicitCallProtocolSupported(scope)) {
-            StoreLocalVarPlacementProblem slvpp = (StoreLocalVarPlacementProblem)scope.getFullInterpreterContext().getDataFlowProblems().get(StoreLocalVarPlacementProblem.NAME);
+            StoreLocalVarPlacementProblem slvpp = scope.getStoreLocalVarPlacementProblem();
             boolean scopeHasLocalVarStores = false;
             boolean bindingHasEscaped      = scope.bindingHasEscaped();
 

diff --git a/core/src/main/java/org/jruby/ir/passes/AddLocalVarLoadStoreInstructions.java b/core/src/main/java/org/jruby/ir/passes/AddLocalVarLoadStoreInstructions.java
@@ -7,7 +7,6 @@
 import org.jruby.ir.dataflow.analyses.StoreLocalVarPlacementProblem;
 import org.jruby.ir.instructions.Instr;
 import org.jruby.ir.operands.Operand;
-import org.jruby.ir.operands.Variable;
 import org.jruby.ir.representations.BasicBlock;
 
 import java.util.Arrays;
@@ -70,20 +69,20 @@ public Object execute(IRScope s, Object... data) {
             (new LiveVariableAnalysis()).invalidate(s);
         }
 
-        s.getFullInterpreterContext().getDataFlowProblems().put(StoreLocalVarPlacementProblem.NAME, slvp);
+        s.putStoreLocalVarPlacementProblem(slvp);
 
         return slvp;
     }
 
     @Override
     public Object previouslyRun(IRScope scope) {
-        return scope.getFullInterpreterContext().getDataFlowProblems().get(StoreLocalVarPlacementProblem.NAME);
+        return scope.getStoreLocalVarPlacementProblem();
     }
 
     @Override
     public boolean invalidate(IRScope scope) {
         super.invalidate(scope);
-        scope.getFullInterpreterContext().getDataFlowProblems().put(StoreLocalVarPlacementProblem.NAME, null);
+        scope.putStoreLocalVarPlacementProblem(null);
         return true;
     }
 }
diff --git a/core/src/main/java/org/jruby/ir/passes/EnsureTempsAssigned.java b/core/src/main/java/org/jruby/ir/passes/EnsureTempsAssigned.java
@@ -9,9 +9,7 @@
 import org.jruby.ir.representations.BasicBlock;
 import org.jruby.ir.representations.CFG;
 
-import java.util.Arrays;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Set;
 
 public class EnsureTempsAssigned extends CompilerPass {

diff --git a/core/src/main/java/org/jruby/ir/passes/LocalOptimizationPass.java b/core/src/main/java/org/jruby/ir/passes/LocalOptimizationPass.java
@@ -1,15 +1,12 @@
 package org.jruby.ir.passes;
 
-import org.jruby.ir.IRClosure;
 import org.jruby.ir.IRScope;
 import org.jruby.ir.Operation;
 import org.jruby.ir.instructions.CopyInstr;
 import org.jruby.ir.instructions.Instr;
 import org.jruby.ir.instructions.ResultInstr;
 import org.jruby.ir.operands.Operand;
 import org.jruby.ir.operands.Variable;
-import org.jruby.ir.representations.BasicBlock;
-import org.jruby.ir.representations.CFG;
 
 import java.util.*;
 

diff --git a/core/src/main/ruby/jruby/jruby.rb b/core/src/main/ruby/jruby/jruby.rb
@@ -72,7 +72,7 @@ def compile(content = nil, filename = (default_filename = true; '-'), extra_posi
       end
 
       runtime = JRuby.runtime
-      irscope = org.jruby.ir.IRBuilder.build_root runtime.getIRManager(), node
+      irscope = org.jruby.ir.IRBuilder.build_root(runtime.getIRManager(), node).scope
 
       visitor = org.jruby.ir.targets.JVMVisitor.new
       bytes = visitor.compile_to_bytecode(irscope);