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

Change dsymbol_alloc to use NEWOBJ_OF

Browse Source
This commit is contained in:
Peter Zhu 2024-02-13 13:44:08 -05:00
parent b1964a9204
commit 4d3fc96b8b
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
symbol.c
View File

@ -630,22 +630,23 @@ dsymbol_alloc(rb_symbols_t *symbols, const VALUE klass, const VALUE str, rb_enco
{ {
ASSERT_vm_locking(); ASSERT_vm_locking();
const VALUE dsym = rb_newobj_of(klass, T_SYMBOL | FL_WB_PROTECTED); NEWOBJ_OF(obj, struct RSymbol, klass, T_SYMBOL | FL_WB_PROTECTED, sizeof(struct RSymbol), 0);
long hashval; long hashval;
rb_enc_set_index(dsym, rb_enc_to_index(enc)); rb_enc_set_index((VALUE)obj, rb_enc_to_index(enc));
OBJ_FREEZE(dsym); OBJ_FREEZE((VALUE)obj);
RB_OBJ_WRITE(dsym, &RSYMBOL(dsym)->fstr, str); RB_OBJ_WRITE((VALUE)obj, &obj->fstr, str);
RSYMBOL(dsym)->id = type; obj->id = type;
/* we want hashval to be in Fixnum range [ruby-core:15713] r15672 */ /* we want hashval to be in Fixnum range [ruby-core:15713] r15672 */
hashval = (long)rb_str_hash(str); hashval = (long)rb_str_hash(str);
RSYMBOL(dsym)->hashval = RSHIFT((long)hashval, 1); obj->hashval = RSHIFT((long)hashval, 1);
register_sym(symbols, str, dsym); register_sym(symbols, str, (VALUE)obj);
rb_hash_aset(symbols->dsymbol_fstr_hash, str, Qtrue); rb_hash_aset(symbols->dsymbol_fstr_hash, str, Qtrue);
RUBY_DTRACE_CREATE_HOOK(SYMBOL, RSTRING_PTR(RSYMBOL(dsym)->fstr)); RUBY_DTRACE_CREATE_HOOK(SYMBOL, RSTRING_PTR(obj->fstr));
return dsym; return (VALUE)obj;
} }
static inline VALUE static inline VALUE