diff options
author | NARUSE, Yui <naruse@airemix.jp> | 2023-01-19 21:52:47 +0900 |
---|---|---|
committer | NARUSE, Yui <naruse@airemix.jp> | 2023-01-19 21:52:47 +0900 |
commit | 6a8fcb50210f8414d76968298576e39b9fa82562 (patch) | |
tree | 654944cb9e09b7876805aa6a4976752325bad1c8 /string.c | |
parent | 98abe4a0be09e0571104f4ca1b5655e353910aa0 (diff) |
merge revision(s) 3be2acfafd3b3c6168e2266c7c6561d143d7ae5c: [Backport #19327]
Fix re-embedding of strings during compaction
The reference updating code for strings is not re-embedding strings
because the code is incorrectly wrapped inside of a
`if (STR_SHARED_P(obj))` clause. Shared strings can't be re-embedded
so this ends up being a no-op. This means that strings can be moved to a
large size pool during compaction, but won't be re-embedded, which would
waste the space.
---
gc.c | 16 +++++++++-------
string.c | 12 ++++++++----
test/ruby/test_gc_compact.rb | 8 ++++----
3 files changed, 21 insertions(+), 15 deletions(-)
Diffstat (limited to 'string.c')
-rw-r--r-- | string.c | 12 |
1 files changed, 8 insertions, 4 deletions
@@ -312,14 +312,18 @@ rb_str_make_embedded(VALUE str) RUBY_ASSERT(rb_str_reembeddable_p(str)); RUBY_ASSERT(!STR_EMBED_P(str)); - char *buf = RSTRING_PTR(str); - long len = RSTRING_LEN(str); + char *buf = RSTRING(str)->as.heap.ptr; + long len = RSTRING(str)->as.heap.len; STR_SET_EMBED(str); STR_SET_EMBED_LEN(str, len); - memmove(RSTRING_PTR(str), buf, len); - ruby_xfree(buf); + if (len > 0) { + memcpy(RSTRING_PTR(str), buf, len); + ruby_xfree(buf); + } + + TERM_FILL(RSTRING(str)->as.embed.ary + len, TERM_LEN(str)); } void |