All is not well in full interp/JIT land for block dispatch of lambdas.

enebo · enebo · commit 15a8220a27e5 · 2018-07-18T11:33:57.000-05:00
ACP pass calls PrepareFixedBlockArgsInstr but each_with_index and a couple
of others when passed a lambda end up expecting the ary spreading we used to
do in prepareFixedBlockArgs.  I tried figuring out how these native calls
could be changed but I see both call and yield on block being hit.  Changing
the error in call to yieldValues did fix one case but I have no confidence
this is correct.

So I removed preparefixed for more generic prepareblockargs for now.  We need
to dig in more here but block args are so complicated.
diff --git a/core/src/main/java/org/jruby/ir/passes/AddCallProtocolInstructions.java b/core/src/main/java/org/jruby/ir/passes/AddCallProtocolInstructions.java
@@ -124,7 +124,7 @@ public Object execute(IRScope scope, Object... data) {
                         if (arityValue == 1) {
                             prologueBB.addInstr(PrepareSingleBlockArgInstr.INSTANCE);
                         } else {
-                            prologueBB.addInstr(PrepareFixedBlockArgsInstr.INSTANCE);
+                            prologueBB.addInstr(PrepareBlockArgsInstr.INSTANCE);
                         }
                     } else {
                         prologueBB.addInstr(PrepareBlockArgsInstr.INSTANCE);

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ public Object execute(IRScope scope, Object... data) {`
`124`	`124`	`if (arityValue == 1) {`
`125`	`125`	`prologueBB.addInstr(PrepareSingleBlockArgInstr.INSTANCE);`
`126`	`126`	`} else {`
`127`		`- prologueBB.addInstr(PrepareFixedBlockArgsInstr.INSTANCE);`
	`127`	`+ prologueBB.addInstr(PrepareBlockArgsInstr.INSTANCE);`
`128`	`128`	`}`
`129`	`129`	`} else {`
`130`	`130`	`prologueBB.addInstr(PrepareBlockArgsInstr.INSTANCE);`