kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

string.c: don't create a frozen copy for str_new_shared

Browse source 
str_new_shared already has all the necessary logic to do this
and is also smart enough to skip this step if the source string
is already a shared string itself.

This saves a useless String allocation on each call.
This commit is contained in:
Jean Boussier 2022-09-26 12:48:24 +02:00
parent 5b0396473b
commit 2e88bca24f
Notes: git 2022-09-26 20:41:56 +09:00 
Merged: https://github.com/ruby/ruby/pull/6443
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
string.c
View file

@ -2923,8 +2923,7 @@ str_substr(VALUE str, long beg, long len, int empty)
if (!STR_EMBEDDABLE_P(len, TERM_LEN(str)) && if (!STR_EMBEDDABLE_P(len, TERM_LEN(str)) &&
SHARABLE_SUBSTRING_P(p, len, RSTRING_END(str))) { SHARABLE_SUBSTRING_P(p, len, RSTRING_END(str))) {
long ofs = p - RSTRING_PTR(str); long ofs = p - RSTRING_PTR(str);
str2 = rb_str_new_frozen(str); str2 = str_new_shared(rb_cString, str);
str2 = str_new_shared(rb_cString, str2);
RSTRING(str2)->as.heap.ptr += ofs; RSTRING(str2)->as.heap.ptr += ofs;
RSTRING(str2)->as.heap.len = len; RSTRING(str2)->as.heap.len = len;
ENC_CODERANGE_CLEAR(str2); ENC_CODERANGE_CLEAR(str2);
@ -6162,8 +6161,7 @@ str_byte_substr(VALUE str, long beg, long len, int empty)
p = s + beg; p = s + beg;
if (!STR_EMBEDDABLE_P(len, TERM_LEN(str)) && SHARABLE_SUBSTRING_P(beg, len, n)) { if (!STR_EMBEDDABLE_P(len, TERM_LEN(str)) && SHARABLE_SUBSTRING_P(beg, len, n)) {
str2 = rb_str_new_frozen(str); str2 = str_new_shared(rb_cString, str);
str2 = str_new_shared(rb_cString, str2);
RSTRING(str2)->as.heap.ptr += beg; RSTRING(str2)->as.heap.ptr += beg;
RSTRING(str2)->as.heap.len = len; RSTRING(str2)->as.heap.len = len;
} }