From adfe4f39304f330cebe673d603b226713ce58210 Mon Sep 17 00:00:00 2001 From: mame Date: Tue, 20 Apr 2010 15:28:33 +0000 Subject: * compile.c (NODE_NEXT, NODE_REDO): add dummy putnil instruction to fix stack consistency error. [ruby-core:28172] * bootstraptest/test_jump.rb: add a test for above. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27424 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- compile.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'compile.c') diff --git a/compile.c b/compile.c index e96e34da5b..f1a04feaba 100644 --- a/compile.c +++ b/compile.c @@ -3359,6 +3359,9 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) ADD_ADJUST(ret, nd_line(node), iseq->compile_data->redo_label); ADD_INSNL(ret, nd_line(node), jump, iseq->compile_data->start_label); ADD_ADJUST_RESTORE(ret, splabel); + if (!poped) { + ADD_INSN(ret, nd_line(node), putnil); + } } else if (iseq->compile_data->end_label) { LABEL *splabel = NEW_LABEL(0); @@ -3424,6 +3427,9 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) add_ensure_iseq(ret, iseq, 0); ADD_INSNL(ret, nd_line(node), jump, iseq->compile_data->redo_label); ADD_ADJUST_RESTORE(ret, splabel); + if (!poped) { + ADD_INSN(ret, nd_line(node), putnil); + } } else if (iseq->type == ISEQ_TYPE_EVAL) { redo_in_eval: -- cgit v1.2.3