ruby-changes:25201
From: ko1 <ko1@a...>
Date: Thu, 18 Oct 2012 14:33:43 +0900 (JST)
Subject: [ruby-changes:25201] ko1:r37253 (trunk): * compile.c (new_callinfo): set a temporary index of callinfo
ko1 2012-10-18 14:33:31 +0900 (Thu, 18 Oct 2012) New Revision: 37253 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=37253 Log: * compile.c (new_callinfo): set a temporary index of callinfo (used in `iseq_set_sequence()') to rb_call_info_t::aux::index. rb_call_info_t::argc is initialiesed by same value of rb_call_info_t::orig_argc. Modified files: trunk/ChangeLog trunk/compile.c Index: ChangeLog =================================================================== --- ChangeLog (revision 37252) +++ ChangeLog (revision 37253) @@ -1,3 +1,10 @@ +Thu Oct 18 14:31:17 2012 Koichi Sasada <ko1@a...> + + * compile.c (new_callinfo): set a temporary index of callinfo + (used in `iseq_set_sequence()') to rb_call_info_t::aux::index. + rb_call_info_t::argc is initialiesed by same value of + rb_call_info_t::orig_argc. + Thu Oct 18 14:11:08 2012 Koichi Sasada <ko1@a...> * class.c (rb_define_frameless_method): rename from Index: compile.c =================================================================== --- compile.c (revision 37252) +++ compile.c (revision 37253) @@ -942,6 +942,7 @@ ci->mid = mid; ci->flag = flag; ci->orig_argc = argc; + ci->argc = argc; if (block) { GetISeqPtr(block, ci->blockiseq); @@ -953,7 +954,7 @@ } } ci->vmstat = 0; - ci->argc = iseq->callinfo_size++; /* index of callinfo in this iseq */ + ci->aux.index = iseq->callinfo_size++; return ci; } @@ -1520,10 +1521,10 @@ case TS_CALLINFO: /* call info */ { rb_call_info_t *base_ci = (rb_call_info_t *)operands[j]; - rb_call_info_t *ci = &iseq->callinfo_entries[base_ci->argc]; + rb_call_info_t *ci = &iseq->callinfo_entries[base_ci->aux.index]; *ci = *base_ci; - if (UNLIKELY(base_ci->argc >= iseq->callinfo_size)) { + if (UNLIKELY(base_ci->aux.index >= iseq->callinfo_size)) { rb_bug("iseq_set_sequence: ci_index overflow: index: %d, size: %d", base_ci->argc, iseq->callinfo_size); } generated_iseq[pos + 1 + j] = (VALUE)ci; -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/