diff options
author | NARUSE, Yui <naruse@airemix.jp> | 2023-01-31 23:46:50 +0900 |
---|---|---|
committer | NARUSE, Yui <naruse@airemix.jp> | 2023-01-31 23:46:50 +0900 |
commit | 40e0b1e123503805c16a2a9aafae0a5c302c20d1 (patch) | |
tree | 096bde10ac9a07fd199ae128e2d86dacae6b702a | |
parent | 22bfad0ec9968be4c99c8c68f2c809b833069ea7 (diff) | |
download | ruby-40e0b1e123503805c16a2a9aafae0a5c302c20d1.tar.gz |
merge revision(s) 9726736006b3f74635fd8af05814fe0908e2cf84: [Backport #19327]
Set STR_SHARED_ROOT flag on root of string
---
string.c | 1 +
1 file changed, 1 insertion(+)
-rw-r--r-- | string.c | 1 | ||||
-rw-r--r-- | version.h | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -1787,6 +1787,7 @@ str_duplicate_setup(VALUE klass, VALUE str, VALUE dup) else { RSTRING(dup)->as.heap.len = RSTRING_LEN(str); RSTRING(dup)->as.heap.ptr = RSTRING_PTR(str); + FL_SET(root, STR_SHARED_ROOT); RB_OBJ_WRITE(dup, &RSTRING(dup)->as.heap.aux.shared, root); flags |= RSTRING_NOEMBED | STR_SHARED; } @@ -11,7 +11,7 @@ # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR #define RUBY_VERSION_TEENY 0 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 24 +#define RUBY_PATCHLEVEL 25 #include "ruby/version.h" #include "ruby/internal/abi.h" |