diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | string.c | 27 |
2 files changed, 21 insertions, 13 deletions
@@ -1,3 +1,10 @@ +Wed Dec 4 12:57:24 2013 Aman Gupta <ruby@tmm1.net> + + * string.c (fstr_update_callback): Improve implementation in r43968 + based on feedback from @nagachika. In the existing case, we can + return ST_STOP to prevent any hash modification. In the !existing + case, set both key and value to the fstr. + Wed Dec 4 12:47:54 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> * lib/delegate.rb (Delegator#method_missing): ignore the target if not @@ -137,23 +137,24 @@ fstr_update_callback(st_data_t *key, st_data_t *value, st_data_t arg, int existi { VALUE *fstr = (VALUE *)arg; if (existing) { - /* because of lazy sweep, str may be unmaked already and swept + /* because of lazy sweep, str may be unmarked already and swept * at next time */ rb_gc_resurrect(*fstr = *key); - } else { - VALUE str = *key; - if (STR_SHARED_P(str)) { - /* str should not be shared */ - str = rb_enc_str_new(RSTRING_PTR(str), RSTRING_LEN(str), STR_ENC_GET(str)); - OBJ_FREEZE(str); - } - else { - str = rb_str_new_frozen(str); - } - RBASIC(str)->flags |= RSTRING_FSTR; - *fstr = *key = str; + return ST_STOP; + } + + VALUE str = *key; + if (STR_SHARED_P(str)) { + /* str should not be shared */ + str = rb_enc_str_new(RSTRING_PTR(str), RSTRING_LEN(str), STR_ENC_GET(str)); + OBJ_FREEZE(str); + } + else { + str = rb_str_new_frozen(str); } + RBASIC(str)->flags |= RSTRING_FSTR; + *key = *value = *fstr = str; return ST_CONTINUE; } |