From 5c3f9641c0475b6ec2e26c8e6df921abf47856ca Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 19 Dec 2017 00:45:55 +0000 Subject: compile.c: side effect in splat * compile.c (compile_array): splat which may have side effects should be compiled even if the result will be popped. [ruby-core:84340] [Bug #14201] From: Nobuyoshi Nakada git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61329 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- compile.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'compile.c') diff --git a/compile.c b/compile.c index 37f024b3cc..addf3be596 100644 --- a/compile.c +++ b/compile.c @@ -3619,7 +3619,7 @@ compile_array(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node_ro } } else { - if (!popped) { + if (!popped || kw) { switch (type) { case COMPILE_ARRAY_TYPE_ARRAY: ADD_INSN1(anchor, line, newarray, INT2FIX(i)); @@ -3660,6 +3660,9 @@ compile_array(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node_ro APPEND_LIST(ret, anchor); break; } + if (popped) { + ADD_INSN(ret, line, pop); + } } else { /* popped */ @@ -6268,7 +6271,7 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in } case NODE_HASH:{ DECL_ANCHOR(list); - int type = node->nd_head ? nd_type(node->nd_head) : NODE_ZARRAY; + enum node_type type = node->nd_head ? nd_type(node->nd_head) : NODE_ZARRAY; INIT_ANCHOR(list); switch (type) { -- cgit v1.2.3