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

Symbols can move, so don't cache in static pointer

Browse Source 
This changes the static pointers to use IDs then look up the symbols
with the ID.  Symbols can move, so we don't want to keep static
references to them.
This commit is contained in:
Aaron Patterson 2019-04-22 16:23:04 -07:00
parent 6fbf4e22c8
commit 98ee63693d
No known key found for this signature in database
GPG Key ID: 953170BCB4FFAFC6
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
iseq.c
View File

@ -2501,10 +2501,10 @@ ruby_node_name(int node)
} }
#define DECL_SYMBOL(name) \ #define DECL_SYMBOL(name) \
static VALUE sym_##name static ID sym_##name
#define INIT_SYMBOL(name) \ #define INIT_SYMBOL(name) \
sym_##name = ID2SYM(rb_intern(#name)) sym_##name = rb_intern(#name)
static VALUE static VALUE
register_label(struct st_table *table, unsigned long idx) register_label(struct st_table *table, unsigned long idx)
@ -2551,7 +2551,7 @@ iseq_data_to_ary(const rb_iseq_t *iseq)
VALUE *seq, *iseq_original; VALUE *seq, *iseq_original;
VALUE val = rb_ary_new(); VALUE val = rb_ary_new();
VALUE type; /* Symbol */ ID type; /* Symbol */
VALUE locals = rb_ary_new(); VALUE locals = rb_ary_new();
VALUE params = rb_hash_new(); VALUE params = rb_hash_new();
VALUE body = rb_ary_new(); /* [[:insn1, ...], ...] */ VALUE body = rb_ary_new(); /* [[:insn1, ...], ...] */
@ -2559,7 +2559,7 @@ iseq_data_to_ary(const rb_iseq_t *iseq)
VALUE exception = rb_ary_new(); /* [[....]] */ VALUE exception = rb_ary_new(); /* [[....]] */
VALUE misc = rb_hash_new(); VALUE misc = rb_hash_new();
static VALUE insn_syms[VM_INSTRUCTION_SIZE/2]; /* w/o-trace only */ static ID insn_syms[VM_INSTRUCTION_SIZE/2]; /* w/o-trace only */
struct st_table *labels_table = st_init_numtable(); struct st_table *labels_table = st_init_numtable();
DECL_SYMBOL(top); DECL_SYMBOL(top);
@ -2575,7 +2575,7 @@ iseq_data_to_ary(const rb_iseq_t *iseq)
if (sym_top == 0) { if (sym_top == 0) {
int i; int i;
for (i=0; i<numberof(insn_syms); i++) { for (i=0; i<numberof(insn_syms); i++) {
insn_syms[i] = ID2SYM(rb_intern(insn_name(i))); insn_syms[i] = rb_intern(insn_name(i));
} }
INIT_SYMBOL(top); INIT_SYMBOL(top);
INIT_SYMBOL(method); INIT_SYMBOL(method);
@ -2671,7 +2671,7 @@ iseq_data_to_ary(const rb_iseq_t *iseq)
VALUE *nseq = seq + len - 1; VALUE *nseq = seq + len - 1;
VALUE ary = rb_ary_new2(len); VALUE ary = rb_ary_new2(len);
rb_ary_push(ary, insn_syms[insn%numberof(insn_syms)]); rb_ary_push(ary, ID2SYM(insn_syms[insn%numberof(insn_syms)]));
for (j=0; j<len-1; j++, seq++) { for (j=0; j<len-1; j++, seq++) {
switch (insn_op_type(insn, j)) { switch (insn_op_type(insn, j)) {
case TS_OFFSET: { case TS_OFFSET: {
@ -2865,7 +2865,7 @@ iseq_data_to_ary(const rb_iseq_t *iseq)
rb_ary_push(val, rb_iseq_path(iseq)); rb_ary_push(val, rb_iseq_path(iseq));
rb_ary_push(val, rb_iseq_realpath(iseq)); rb_ary_push(val, rb_iseq_realpath(iseq));
rb_ary_push(val, iseq_body->location.first_lineno); rb_ary_push(val, iseq_body->location.first_lineno);
rb_ary_push(val, type); rb_ary_push(val, ID2SYM(type));
rb_ary_push(val, locals); rb_ary_push(val, locals);
rb_ary_push(val, params); rb_ary_push(val, params);
rb_ary_push(val, exception); rb_ary_push(val, exception);