1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

compile.c: side effect in splat

Browse Source 
* 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
This commit is contained in:
nobu 2017-12-19 00:45:55 +00:00
parent 494b3aeaea
commit 5c3f9641c0
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
compile.c
View File

@ -3619,7 +3619,7 @@ compile_array(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node_ro
} }
} }
else { else {
if (!popped) { if (!popped || kw) {
switch (type) { switch (type) {
case COMPILE_ARRAY_TYPE_ARRAY: case COMPILE_ARRAY_TYPE_ARRAY:
ADD_INSN1(anchor, line, newarray, INT2FIX(i)); 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); APPEND_LIST(ret, anchor);
break; break;
} }
if (popped) {
ADD_INSN(ret, line, pop);
}
} }
else { else {
/* popped */ /* popped */
@ -6268,7 +6271,7 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
} }
case NODE_HASH:{ case NODE_HASH:{
DECL_ANCHOR(list); 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); INIT_ANCHOR(list);
switch (type) { switch (type) {

6
test/ruby/test_optimization.rb
View File

@ -702,4 +702,10 @@ class TestRubyOptimization < Test::Unit::TestCase
} }
END END
end end
def test_side_effect_in_popped_splat
bug = '[ruby-core:84340] [Bug #14201]'
eval("{**(bug = nil; {})};42")
assert_nil(bug)
end
end end