merge revision(s) 9726736006b3f74635fd8af05814fe0908e2cf84: [Backport #19327]

	Set STR_SHARED_ROOT flag on root of string

	---
	 string.c | 1 +
	 1 file changed, 1 insertion(+)

2 files changed, 2 insertions, 1 deletions

diff --git a/string.c b/string.c
index cae87907c3..6773ed2d86 100644
--- a/string.c
+++ b/string.c
@@ -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;
         }
diff --git a/version.h b/version.h
index 2dc130ab2b..00147ecc6f 100644
--- a/version.h
+++ b/version.h
@@ -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"