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

Prefix global_symbols with ruby_

This commit is contained in:
Nobuyoshi Nakada 2019-05-16 15:43:16 +09:00
parent 973431c059
commit 7069f64c41
No known key found for this signature in database
GPG key ID: 4BC7D6DF58D8DF60
3 changed files with 6 additions and 4 deletions

View file

@ -1073,9 +1073,9 @@ define print_id
else else
set $serial = (rb_id_serial_t)$id set $serial = (rb_id_serial_t)$id
end end
if $serial && $serial <= global_symbols.last_id if $serial && $serial <= ruby_global_symbols.last_id
set $idx = $serial / ID_ENTRY_UNIT set $idx = $serial / ID_ENTRY_UNIT
set $ids = (struct RArray *)global_symbols.ids set $ids = (struct RArray *)ruby_global_symbols.ids
set $flags = $ids->basic.flags set $flags = $ids->basic.flags
if ($flags & RUBY_FL_USER1) if ($flags & RUBY_FL_USER1)
set $idsptr = $ids->as.ary set $idsptr = $ids->as.ary

3
gc.c
View file

@ -8080,7 +8080,8 @@ gc_ref_update(void *vstart, void *vend, size_t stride, void * data)
return 0; return 0;
} }
extern rb_symbols_t global_symbols; extern rb_symbols_t ruby_global_symbols;
#define global_symbols ruby_global_symbols
static void static void
gc_update_references(rb_objspace_t * objspace) gc_update_references(rb_objspace_t * objspace)

View file

@ -63,7 +63,8 @@ enum id_entry_type {
ID_ENTRY_SIZE ID_ENTRY_SIZE
}; };
rb_symbols_t global_symbols = {tNEXT_ID-1}; rb_symbols_t ruby_global_symbols = {tNEXT_ID-1};
#define global_symbols ruby_global_symbols
static const struct st_hash_type symhash = { static const struct st_hash_type symhash = {
rb_str_hash_cmp, rb_str_hash_cmp,