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

* compile.c (iseq_compile_each): "a[*b] += 1" dumps core.

Browse Source 
a patch from Yusuke ENDOH <mame AT tsg.ne.jp>.  [ruby-dev:32354]
* bootstraptest/test_syntax.rb: add a test for above.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14032 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2007-11-27 06:45:01 +00:00
parent b0986a8f82
commit 1bed0ccca8
3 changed files with 105 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Tue Nov 27 15:40:05 2007 Koichi Sasada <ko1@atdot.net>
* compile.c (iseq_compile_each): "a[*b] += 1" dumps core.
a patch from Yusuke ENDOH <mame AT tsg.ne.jp>. [ruby-dev:32354]
* bootstraptest/test_syntax.rb: add a test for above.
Tue Nov 27 12:47:23 2007 Koichi Sasada <ko1@atdot.net> Tue Nov 27 12:47:23 2007 Koichi Sasada <ko1@atdot.net>
* compile.c, insns.def: change return value of "defined?" * compile.c, insns.def: change return value of "defined?"

4
bootstraptest/test_syntax.rb
View File

@ -608,3 +608,7 @@ assert_equal '3', %q{
p(1, (redo; 2)) p(1, (redo; 2))
end) end)
} }
assert_equal '1', %q{
a = [0]
a[*a]+=1
}

47
compile.c
View File

@ -3301,7 +3301,8 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
} }
case NODE_OP_ASGN1: { case NODE_OP_ASGN1: {
DECL_ANCHOR(args); DECL_ANCHOR(args);
int argc; VALUE argc;
unsigned long flag = 0;
ID id = node->nd_mid; ID id = node->nd_mid;
/* /*
@ -3324,13 +3325,17 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
* nd_mid * nd_mid
*/ */
INIT_ANCHOR(args);
COMPILE(ret, "NODE_OP_ASGN1 recv", node->nd_recv); COMPILE(ret, "NODE_OP_ASGN1 recv", node->nd_recv);
argc = compile_array(iseq, args, node->nd_args->nd_body, Qfalse); if (nd_type(node->nd_args->nd_body) != NODE_ZARRAY) {
POP_ELEMENT(args); INIT_ANCHOR(args);
argc = setup_args(iseq, args, node->nd_args->nd_body, &flag);
ADD_SEQ(ret, args); ADD_SEQ(ret, args);
ADD_INSN1(ret, nd_line(node), dupn, INT2FIX(argc+1)); }
ADD_SEND(ret, nd_line(node), ID2SYM(idAREF), INT2FIX(argc)); else {
argc = FIX2INT(0);
}
ADD_INSN1(ret, nd_line(node), dupn, INT2FIX(FIX2INT(argc)+1));
ADD_SEND_R(ret, nd_line(node), ID2SYM(idAREF), argc, Qfalse, LONG2FIX(flag));
if (id == 0 || id == 1) { if (id == 0 || id == 1) {
/* 0: or, 1: and /* 0: or, 1: and
@ -3356,10 +3361,17 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
ADD_INSNL(ret, nd_line(node), branchunless, label); ADD_INSNL(ret, nd_line(node), branchunless, label);
} }
COMPILE(ret, "NODE_OP_ASGN1 args->head: ", COMPILE(ret, "NODE_OP_ASGN1 args->head: ", node->nd_args->nd_head);
node->nd_args->nd_head); if (flag & VM_CALL_ARGS_SPLAT_BIT) {
ADD_SEND(ret, nd_line(node), ID2SYM(idASET), ADD_INSN1(ret, nd_line(node), newarray, INT2FIX(1));
INT2FIX(argc + 1)); ADD_INSN(ret, nd_line(node), concatarray);
ADD_SEND_R(ret, nd_line(node), ID2SYM(idASET),
argc, Qfalse, LONG2FIX(flag));
}
else {
ADD_SEND_R(ret, nd_line(node), ID2SYM(idASET),
INT2FIX(FIX2INT(argc) + 1), Qfalse, LONG2FIX(flag));
}
ADD_INSNL(ret, nd_line(node), jump, lfin); ADD_INSNL(ret, nd_line(node), jump, lfin);
ADD_LABEL(ret, label); ADD_LABEL(ret, label);
if (id == 0) { /* or */ if (id == 0) { /* or */
@ -3376,11 +3388,18 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
ADD_LABEL(ret, lfin); ADD_LABEL(ret, lfin);
} }
else { else {
COMPILE(ret, "NODE_OP_ASGN1 args->head: ", COMPILE(ret, "NODE_OP_ASGN1 args->head: ", node->nd_args->nd_head);
node->nd_args->nd_head);
ADD_SEND(ret, nd_line(node), ID2SYM(id), INT2FIX(1)); ADD_SEND(ret, nd_line(node), ID2SYM(id), INT2FIX(1));
ADD_SEND(ret, nd_line(node), ID2SYM(idASET), if (flag & VM_CALL_ARGS_SPLAT_BIT) {
INT2FIX(argc + 1)); ADD_INSN1(ret, nd_line(node), newarray, INT2FIX(1));
ADD_INSN(ret, nd_line(node), concatarray);
ADD_SEND_R(ret, nd_line(node), ID2SYM(idASET),
argc, Qfalse, LONG2FIX(flag));
}
else {
ADD_SEND_R(ret, nd_line(node), ID2SYM(idASET),
INT2FIX(FIX2INT(argc) + 1), Qfalse, LONG2FIX(flag));
}
} }
if (poped) { if (poped) {