diff options
author | Jean Boussier <jean.boussier@gmail.com> | 2020-01-27 14:47:24 +0100 |
---|---|---|
committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2020-01-31 09:22:20 +0900 |
commit | 52dc0632faa8450af90e37ef3c2c9f30d06951a1 (patch) | |
tree | 407fdb9d3476a0537ee6c4f97a15f4b1e87b181c | |
parent | ca2888fb3d23d702738873f5c0f956575fd3c5d3 (diff) | |
download | ruby-52dc0632faa8450af90e37ef3c2c9f30d06951a1.tar.gz |
Avoid allocating a temporary empty string in String#slice!
-rw-r--r-- | string.c | 11 |
1 files changed, 8 insertions, 3 deletions
@@ -215,6 +215,8 @@ str_make_independent(VALUE str) /* symbols for [up|down|swap]case/capitalize options */ static VALUE sym_ascii, sym_turkic, sym_lithuanian, sym_fold; +static VALUE empty_string; + static rb_encoding * get_actual_encoding(const int encidx, VALUE str) { @@ -4887,13 +4889,13 @@ rb_str_slice_bang(int argc, VALUE *argv, VALUE str) rb_check_arity(argc, 1, 2); for (i=0; i<argc; i++) { - buf[i] = argv[i]; + buf[i] = argv[i]; } str_modify_keep_cr(str); result = rb_str_aref_m(argc, buf, str); if (!NIL_P(result)) { - buf[i] = rb_str_new(0,0); - rb_str_aset_m(argc+1, buf, str); + buf[i] = empty_string; + rb_str_aset_m(argc+1, buf, str); } return result; } @@ -11380,6 +11382,9 @@ Init_String(void) rb_define_method(rb_cString, "unicode_normalize!", rb_str_unicode_normalize_bang, -1); rb_define_method(rb_cString, "unicode_normalized?", rb_str_unicode_normalized_p, -1); + empty_string = rb_fstring_enc_lit("", rb_usascii_encoding()); + rb_gc_register_mark_object(empty_string); + rb_fs = Qnil; rb_define_hooked_variable("$;", &rb_fs, 0, rb_fs_setter); rb_define_hooked_variable("$-F", &rb_fs, 0, rb_fs_setter); |