Fix OptimizeDynScopesPass issue from last commit. We were using a nul…

…l check to initialize which is no longer possible with new InterpreterContext.
jruby · Oct 14, 2014 · ec53bfb · ec53bfb
1 parent a78963b
commit ec53bfb
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 16 deletions.
diff --git a/core/src/main/java/org/jruby/internal/runtime/methods/InterpretedIRMethod.java b/core/src/main/java/org/jruby/internal/runtime/methods/InterpretedIRMethod.java
@@ -139,10 +139,9 @@ protected void pre(ThreadContext context, IRubyObject self, String name, Block b
     public void ensureInstrsReady() {
         // SSS FIXME: Move this out of here to some other place?
         // Prepare method if not yet done so we know if the method has an explicit/implicit call protocol
-        if (method.getInstrsForInterpretation() == null) {
-            InterpreterContext context = method.prepareForInterpretation();
-            this.pushScope = !context.getFlags().contains(IRFlags.DYNSCOPE_ELIMINATED);
-        }
+        // FIXME: This is resetting this flag per call and I now may want to push interpretercontext through to interpreter
+        InterpreterContext context = method.prepareForInterpretation();
+        this.pushScope = !context.getFlags().contains(IRFlags.DYNSCOPE_ELIMINATED);
     }
 
     public DynamicMethod getMethodForCaching() {

diff --git a/core/src/main/java/org/jruby/ir/IRScope.java b/core/src/main/java/org/jruby/ir/IRScope.java
@@ -604,7 +604,7 @@ private void optimizeSimpleScopes() {
         // dynscopes for these scopes.
         if (!isUnsafeScope() && !flags.contains(REQUIRES_DYNSCOPE)) {
             (new DeadCodeElimination()).run(this);
-            //(new OptimizeDynScopesPass()).run(this);
+            (new OptimizeDynScopesPass()).run(this);
         }
     }
 

diff --git a/core/src/main/java/org/jruby/runtime/InterpretedIRBlockBody.java b/core/src/main/java/org/jruby/runtime/InterpretedIRBlockBody.java
@@ -26,18 +26,18 @@ public InterpretedIRBlockBody(IRClosure closure, Arity arity, int argumentType)
     }
 
     public void ensureInstrsReady(Block.Type blockType) {
+        // FIXME: probably save interpcontext as a field and use that as a check so we are not retrieving per call
         // Prepare closure if not yet done so we know if the method requires a dynscope or not
-        if (closure.getInstrsForInterpretation() == null) {
-            InterpreterContext context = closure.prepareForInterpretation();
-            this.pushScope = !context.getFlags().contains(IRFlags.DYNSCOPE_ELIMINATED);
-            this.reuseParentScope = context.getFlags().contains(IRFlags.REUSE_PARENT_DYNSCOPE);
-            if (IRRuntimeHelpers.isDebug()) {
-                LOG.info("Executing '" + closure + "'");
-                // The base IR may not have been processed yet
-                CFG cfg = closure.getCFG();
-                LOG.info("Graph:\n" + cfg.toStringGraph());
-                LOG.info("CFG:\n" + cfg.toStringInstrs());
-            }
+        InterpreterContext context = closure.prepareForInterpretation();
+        pushScope = !context.getFlags().contains(IRFlags.DYNSCOPE_ELIMINATED);
+        reuseParentScope = context.getFlags().contains(IRFlags.REUSE_PARENT_DYNSCOPE);
+
+        if (IRRuntimeHelpers.isDebug()) {
+            LOG.info("Executing '" + closure + "' (pushScope=" + pushScope + ", reuseParentScope=" + reuseParentScope);
+            // The base IR may not have been processed yet
+            CFG cfg = closure.getCFG();
+            LOG.info("Graph:\n" + cfg.toStringGraph());
+            LOG.info("CFG:\n" + cfg.toStringInstrs());
         }
     }