1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* iseq.c (set_relation), vm_insnhelper.c (vm_cref_push): nd_file

is always zero-cleared.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30223 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2010-12-15 22:51:51 +00:00
parent 5c9194fe1f
commit 202cb99c86
3 changed files with 5 additions and 4 deletions

View file

@ -1,3 +1,8 @@
Thu Dec 16 07:51:47 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* iseq.c (set_relation), vm_insnhelper.c (vm_cref_push): nd_file
is always zero-cleared.
Wed Dec 15 20:45:02 2010 NAKAMURA Usaku <usa@ruby-lang.org> Wed Dec 15 20:45:02 2010 NAKAMURA Usaku <usa@ruby-lang.org>
* lib/test/unit.rb (process_args): need to setup @help to print options. * lib/test/unit.rb (process_args): need to setup @help to print options.

3
iseq.c
View file

@ -183,11 +183,9 @@ set_relation(rb_iseq_t *iseq, const VALUE parent)
if (type == ISEQ_TYPE_TOP) { if (type == ISEQ_TYPE_TOP) {
/* toplevel is private */ /* toplevel is private */
iseq->cref_stack = NEW_BLOCK(rb_cObject); iseq->cref_stack = NEW_BLOCK(rb_cObject);
iseq->cref_stack->nd_file = 0;
iseq->cref_stack->nd_visi = NOEX_PRIVATE; iseq->cref_stack->nd_visi = NOEX_PRIVATE;
if (th->top_wrapper) { if (th->top_wrapper) {
NODE *cref = NEW_BLOCK(th->top_wrapper); NODE *cref = NEW_BLOCK(th->top_wrapper);
cref->nd_file = 0;
cref->nd_visi = NOEX_PRIVATE; cref->nd_visi = NOEX_PRIVATE;
cref->nd_next = iseq->cref_stack; cref->nd_next = iseq->cref_stack;
iseq->cref_stack = cref; iseq->cref_stack = cref;
@ -195,7 +193,6 @@ set_relation(rb_iseq_t *iseq, const VALUE parent)
} }
else if (type == ISEQ_TYPE_METHOD || type == ISEQ_TYPE_CLASS) { else if (type == ISEQ_TYPE_METHOD || type == ISEQ_TYPE_CLASS) {
iseq->cref_stack = NEW_BLOCK(0); /* place holder */ iseq->cref_stack = NEW_BLOCK(0); /* place holder */
iseq->cref_stack->nd_file = 0;
} }
else if (RTEST(parent)) { else if (RTEST(parent)) {
rb_iseq_t *piseq; rb_iseq_t *piseq;

View file

@ -1087,7 +1087,6 @@ vm_cref_push(rb_thread_t *th, VALUE klass, int noex, rb_block_t *blockptr)
{ {
rb_control_frame_t *cfp = vm_get_ruby_level_caller_cfp(th, th->cfp); rb_control_frame_t *cfp = vm_get_ruby_level_caller_cfp(th, th->cfp);
NODE *cref = NEW_BLOCK(klass); NODE *cref = NEW_BLOCK(klass);
cref->nd_file = 0;
cref->nd_visi = noex; cref->nd_visi = noex;
if (blockptr) { if (blockptr) {