Bug fix adding block call protocol instructions

meteor and gem list now run with -X-C and block call protocol enabled. So, first pass of block call protocol is now done and verified (not very thoroughly) in interpreter mode. JIT mode, here we come next.
jruby · Dec 7, 2015 · 61127db · 61127db
1 parent ad919a7
commit 61127db
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/core/src/main/java/org/jruby/ir/passes/AddCallProtocolInstructions.java b/core/src/main/java/org/jruby/ir/passes/AddCallProtocolInstructions.java
@@ -83,7 +83,8 @@ public Object execute(IRScope scope, Object... data) {
 
         // For now, we always require frame for closures
         boolean requireFrame = doesItRequireFrame(scope, bindingHasEscaped);
-        boolean requireBinding = !scope.getFlags().contains(IRFlags.DYNSCOPE_ELIMINATED);
+        boolean reuseParentDynScope = scope.getFlags().contains(IRFlags.REUSE_PARENT_DYNSCOPE);
+        boolean requireBinding = reuseParentDynScope || !scope.getFlags().contains(IRFlags.DYNSCOPE_ELIMINATED);
 
         if (scope instanceof IRClosure || requireBinding || requireFrame) {
             BasicBlock entryBB = cfg.getEntryBB();