ruby-changes:72157
From: Nobuyoshi <ko1@a...>
Date: Tue, 14 Jun 2022 10:36:17 +0900 (JST)
Subject: [ruby-changes:72157] 048f14221c (master): Add placeholder to let braces match
https://git.ruby-lang.org/ruby.git/commit/?id=048f14221c From 048f14221cc8498ea8e5e339b6744288788a0303 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada <nobu@r...> Date: Tue, 14 Jun 2022 10:21:55 +0900 Subject: Add placeholder to let braces match --- string.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/string.c b/string.c index 4dc462f5c4..68baa91cc0 100644 --- a/string.c +++ b/string.c @@ -299,7 +299,8 @@ rb_str_make_independent(VALUE str) https://github.com/ruby/ruby/blob/trunk/string.c#L299 } void -rb_str_make_embedded(VALUE str) { +rb_str_make_embedded(VALUE str) +{ RUBY_ASSERT(rb_str_reembeddable_p(str)); RUBY_ASSERT(!STR_EMBED_P(str)); @@ -1806,15 +1807,14 @@ str_duplicate_setup(VALUE klass, VALUE str, VALUE dup) https://github.com/ruby/ruby/blob/trunk/string.c#L1807 } assert(!STR_SHARED_P(root)); assert(RB_OBJ_FROZEN_RAW(root)); -#if USE_RVARGC - if (1) { -#else - if (STR_EMBED_P(root)) { + if (0) {} +#if !USE_RVARGC + else if (STR_EMBED_P(root)) { MEMCPY(RSTRING(dup)->as.embed.ary, RSTRING(root)->as.embed.ary, char, RSTRING_EMBED_LEN_MAX + 1); } - else { #endif + else { RSTRING(dup)->as.heap.len = RSTRING_LEN(str); RSTRING(dup)->as.heap.ptr = RSTRING_PTR(str); RB_OBJ_WRITE(dup, &RSTRING(dup)->as.heap.aux.shared, root); -- cgit v1.2.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/