diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-12-19 00:45:55 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-12-19 00:45:55 +0000 |
commit | 5c3f9641c0475b6ec2e26c8e6df921abf47856ca (patch) | |
tree | b018ad01a51abbec91a4e65fc4ded887236b9c49 /compile.c | |
parent | 494b3aeaea5cad15ead14853ec7eab1833651642 (diff) | |
download | ruby-5c3f9641c0475b6ec2e26c8e6df921abf47856ca.tar.gz |
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 <nobu@ruby-lang.org>
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61329 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'compile.c')
-rw-r--r-- | compile.c | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -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) { |