If the block var has to go on heap, it must be IRubyObject.

jruby · May 20, 2016 · 88a8896 · 88a8896
1 parent 1c183c0
commit 88a8896
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/core/src/main/java/org/jruby/ir/passes/OptimizeDelegationPass.java b/core/src/main/java/org/jruby/ir/passes/OptimizeDelegationPass.java
@@ -6,6 +6,7 @@
 import org.jruby.ir.instructions.CopyInstr;
 import org.jruby.ir.instructions.Instr;
 import org.jruby.ir.instructions.ReifyClosureInstr;
+import org.jruby.ir.operands.LocalVariable;
 import org.jruby.ir.operands.Operand;
 import org.jruby.ir.operands.Variable;
 import org.jruby.ir.representations.BasicBlock;
@@ -41,6 +42,11 @@ private static void optimizeDelegatedVars(IRScope s) {
             for (Instr i: bb.getInstrs()) {
                 if (i instanceof ReifyClosureInstr) {
                     ReifyClosureInstr ri = (ReifyClosureInstr) i;
+
+                    // can't store un-reified block in DynamicScope (only accepts IRubyObject)
+                    // FIXME: (con) it would be nice to not have this limitation
+                    if (ri.getResult() instanceof LocalVariable) continue;
+
                     unusedExplicitBlocks.put(ri.getResult(), ri.getSource());
                 } else {
                     Iterator<Operand> it = unusedExplicitBlocks.keySet().iterator();