From 8359821870d756eb75d66c5ddb5d119f6247c35d Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Tue, 16 Mar 2021 15:30:47 -0700 Subject: Use rb_fstring for "defined" strings. We can take advantage of fstrings to de-duplicate the defined strings. This means we don't need to keep the list of defined strings on the VM (or register them as mark objects) --- iseq.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) (limited to 'iseq.c') diff --git a/iseq.c b/iseq.c index f696df9e71..3624c5a5c2 100644 --- a/iseq.c +++ b/iseq.c @@ -3103,24 +3103,10 @@ rb_iseq_defined_string(enum defined_type type) "expression", }; const char *estr; - VALUE *defs, str; if ((unsigned)(type - 1) >= (unsigned)numberof(expr_names)) rb_bug("unknown defined type %d", type); estr = expr_names[type - 1]; - if (!estr[0]) return 0; - defs = GET_VM()->defined_strings; - if (!defs) { - defs = ruby_xcalloc(numberof(expr_names), sizeof(VALUE)); - GET_VM()->defined_strings = defs; - } - str = defs[type-1]; - if (!str) { - str = rb_str_new_cstr(estr); - OBJ_FREEZE(str); - defs[type-1] = str; - rb_gc_register_mark_object(str); - } - return str; + return rb_fstring_cstr(estr); } /* A map from encoded_insn to insn_data: decoded insn number, its len, -- cgit v1.2.3