From e362373292e7905f399cf9fb2c1611bf4132614a Mon Sep 17 00:00:00 2001 From: Charles Oliver Nutter Date: Tue, 27 Jun 2017 14:29:25 -0500 Subject: [PATCH] Additional fix for escaped blocks, set in optimized interp path. For #4577 and #4686. --- .../main/java/org/jruby/ir/interpreter/InterpreterEngine.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/org/jruby/ir/interpreter/InterpreterEngine.java b/core/src/main/java/org/jruby/ir/interpreter/InterpreterEngine.java index 730a33bc27e..8273e61a30c 100644 --- a/core/src/main/java/org/jruby/ir/interpreter/InterpreterEngine.java +++ b/core/src/main/java/org/jruby/ir/interpreter/InterpreterEngine.java @@ -329,7 +329,7 @@ protected static void processCall(ThreadContext context, Instr instr, Operation IRubyObject r = (IRubyObject)retrieveOp(call.getReceiver(), context, self, currDynScope, currScope, temp); IRubyObject o = (IRubyObject)call.getArg1().retrieve(context, self, currScope, currDynScope, temp); Block preparedBlock = call.prepareBlock(context, self, currScope, currDynScope, temp); - result = call.getCallSite().call(context, self, r, o, preparedBlock); + result = call.getCallSite().callIter(context, self, r, o, preparedBlock); setResult(temp, currDynScope, call.getResult(), result); break; }