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

Rename STR_IS_SHARED_M to STR_BORROWED

Browse source 
Since the introduction of STR_SHARED_ROOT, the word "shared"
has become very overloaded with respect to String's internal
states. Use a different name for STR_IS_SHARED_M and explain
its purpose.
This commit is contained in:
Alan Wu 2019-09-22 16:09:32 -04:00 committed by Nobuyoshi Nakada
parent 93faa011d3
commit 47a234954a
Notes: git 2019-09-26 15:30:43 +09:00 
Merged: https://github.com/ruby/ruby/pull/2480
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
string.c
View file

@ -74,7 +74,8 @@ VALUE rb_cSymbol;
* 2-6: RSTRING_EMBED_LEN (5 bits == 32) * 2-6: RSTRING_EMBED_LEN (5 bits == 32)
* 5: STR_SHARED_ROOT (RSTRING_NOEMBED==1 && STR_SHARED == 0, there may be * 5: STR_SHARED_ROOT (RSTRING_NOEMBED==1 && STR_SHARED == 0, there may be
* other strings that rely on this string's buffer) * other strings that rely on this string's buffer)
* 6: STR_IS_SHARED_M (shared, when RSTRING_NOEMBED==1 && klass==0) * 6: STR_BORROWED (when RSTRING_NOEMBED==1 && klass==0, unsafe to recycle
* early, specific to rb_str_tmp_frozen_{acquire,release})
* 7: STR_TMPLOCK * 7: STR_TMPLOCK
* 8-9: ENC_CODERANGE (2 bits) * 8-9: ENC_CODERANGE (2 bits)
* 10-16: ENCODING (7 bits == 128) * 10-16: ENCODING (7 bits == 128)
@ -85,7 +86,7 @@ VALUE rb_cSymbol;
#define RUBY_MAX_CHAR_LEN 16 #define RUBY_MAX_CHAR_LEN 16
#define STR_SHARED_ROOT FL_USER5 #define STR_SHARED_ROOT FL_USER5
#define STR_IS_SHARED_M FL_USER6 #define STR_BORROWED FL_USER6
#define STR_TMPLOCK FL_USER7 #define STR_TMPLOCK FL_USER7
#define STR_NOFREE FL_USER18 #define STR_NOFREE FL_USER18
#define STR_FAKESTR FL_USER19 #define STR_FAKESTR FL_USER19
@ -160,7 +161,7 @@ VALUE rb_cSymbol;
FL_SET((str), STR_SHARED); \ FL_SET((str), STR_SHARED); \
FL_SET((shared_str), STR_SHARED_ROOT); \ FL_SET((shared_str), STR_SHARED_ROOT); \
if (RBASIC_CLASS((shared_str)) == 0) /* for CoW-friendliness */ \ if (RBASIC_CLASS((shared_str)) == 0) /* for CoW-friendliness */ \
FL_SET_RAW((shared_str), STR_IS_SHARED_M); \ FL_SET_RAW((shared_str), STR_BORROWED); \
} \ } \
} while (0) } while (0)
@ -1262,7 +1263,7 @@ rb_str_tmp_frozen_release(VALUE orig, VALUE tmp)
!FL_TEST_RAW(orig, STR_TMPLOCK|RUBY_FL_FREEZE)) { !FL_TEST_RAW(orig, STR_TMPLOCK|RUBY_FL_FREEZE)) {
VALUE shared = RSTRING(orig)->as.heap.aux.shared; VALUE shared = RSTRING(orig)->as.heap.aux.shared;
if (shared == tmp && !FL_TEST_RAW(tmp, STR_IS_SHARED_M)) { if (shared == tmp && !FL_TEST_RAW(tmp, STR_BORROWED)) {
FL_UNSET_RAW(orig, STR_SHARED); FL_UNSET_RAW(orig, STR_SHARED);
assert(RSTRING(orig)->as.heap.ptr == RSTRING(tmp)->as.heap.ptr); assert(RSTRING(orig)->as.heap.ptr == RSTRING(tmp)->as.heap.ptr);
assert(RSTRING(orig)->as.heap.len == RSTRING(tmp)->as.heap.len); assert(RSTRING(orig)->as.heap.len == RSTRING(tmp)->as.heap.len);
@ -1300,7 +1301,7 @@ str_new_frozen(VALUE klass, VALUE orig)
} }
else { else {
if (RBASIC_CLASS(shared) == 0) if (RBASIC_CLASS(shared) == 0)
FL_SET_RAW(shared, STR_IS_SHARED_M); FL_SET_RAW(shared, STR_BORROWED);
return shared; return shared;
} }
} }
@ -1321,7 +1322,7 @@ str_new_frozen(VALUE klass, VALUE orig)
RBASIC(orig)->flags &= ~STR_NOFREE; RBASIC(orig)->flags &= ~STR_NOFREE;
STR_SET_SHARED(orig, str); STR_SET_SHARED(orig, str);
if (klass == 0) if (klass == 0)
FL_UNSET_RAW(str, STR_IS_SHARED_M); FL_UNSET_RAW(str, STR_BORROWED);
} }
} }