(13/11/28 16:55), tmm1 (Aman Gupta) wrote:
> diff --git a/parse.y b/parse.y
> index 8207ad7..b1f3112 100644
> --- a/parse.y
> +++ b/parse.y
> @@ -10333,7 +10333,7 @@ register_symid(ID id, const char *name, long len, rb_encoding *enc)
>  static ID
>  register_symid_str(ID id, VALUE str)
>  {
> -    OBJ_FREEZE(str);
> +    str = rb_fstring(str);

At this point, rb_cString is not created yet.
And unfrozen string will be duplicated in rb_fstring().


diff --git i/parse.y w/parse.y index 8207ad7..9f580e6 100644 --- i/parse.y +++ w/parse.y @@ -10334,6 +10334,7 @@ static ID register_symid_str(ID id, VALUE str) { OBJ_FREEZE(str); + str = rb_fstring(str); if (RUBY_DTRACE_SYMBOL_CREATE_ENABLED()) { RUBY_DTRACE_SYMBOL_CREATE(RSTRING_PTR(str), rb_sourcefile(), rb_sourceline()); diff --git i/string.c w/string.c index 151170c..ec43af7 100644 --- i/string.c +++ w/string.c @@ -165,6 +165,9 @@ rb_fstring(VALUE str) VALUE fstr = Qnil; Check_Type(str, T_STRING); + if (!frozen_strings) + frozen_strings = st_init_table(&fstring_hash_type); + if (FL_TEST(str, RSTRING_FSTR)) return str; @@ -173,6 +176,13 @@ rb_fstring(VALUE str) } static int +fstring_set_class_i(st_data_t key, st_data_t val, st_data_t arg) +{ + RBASIC_SET_CLASS((VALUE)key, (VALUE)arg); + return ST_CONTINUE; +} + +static int fstring_cmp(VALUE a, VALUE b) { int cmp = rb_str_hash_cmp(a, b); @@ -8718,8 +8728,6 @@ Init_String(void) #undef rb_intern #define rb_intern(str) rb_intern_const(str) - frozen_strings = st_init_table(&fstring_hash_type); - rb_cString = rb_define_class("String", rb_cObject); rb_include_module(rb_cString, rb_mComparable); rb_define_alloc_func(rb_cString, empty_str_alloc); @@ -8891,4 +8899,6 @@ Init_String(void) rb_define_method(rb_cSymbol, "swapcase", sym_swapcase, 0); rb_define_method(rb_cSymbol, "encoding", sym_encoding, 0); + + st_foreach(frozen_strings, fstring_set_class_i, rb_cString); }
-- Nobu Nakada