ruby-changes:59885
From: Jean <ko1@a...>
Date: Fri, 31 Jan 2020 09:22:44 +0900 (JST)
Subject: [ruby-changes:59885] 52dc0632fa (master): Avoid allocating a temporary empty string in String#slice!
https://git.ruby-lang.org/ruby.git/commit/?id=52dc0632fa From 52dc0632faa8450af90e37ef3c2c9f30d06951a1 Mon Sep 17 00:00:00 2001 From: Jean Boussier <jean.boussier@g...> Date: Mon, 27 Jan 2020 14:47:24 +0100 Subject: Avoid allocating a temporary empty string in String#slice! diff --git a/string.c b/string.c index cdd987d..4ae804b 100644 --- a/string.c +++ b/string.c @@ -215,6 +215,8 @@ str_make_independent(VALUE str) https://github.com/ruby/ruby/blob/trunk/string.c#L215 /* 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) https://github.com/ruby/ruby/blob/trunk/string.c#L4889 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) https://github.com/ruby/ruby/blob/trunk/string.c#L11382 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); -- cgit v0.10.2 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/