From 7002e776944ddfd362cea253d18d02bc250fe9f7 Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Sun, 24 Dec 2023 19:22:13 -0500 Subject: [PATCH] Fix Symbol#inspect for GC compaction The test fails when RGENGC_CHECK_MODE is turned on: 1) Failure: TestSymbol#test_inspect_under_gc_compact_stress [test/ruby/test_symbol.rb:123]: <":testing"> expected but was <":\x00\x00\x00\x00\x00\x00\x00">. --- string.c | 7 ++++++- test/ruby/test_symbol.rb | 6 ++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/string.c b/string.c index 712c963058a7c7..b770daf681a15a 100644 --- a/string.c +++ b/string.c @@ -11630,10 +11630,15 @@ sym_inspect(VALUE sym) } else { rb_encoding *enc = STR_ENC_GET(str); - RSTRING_GETMEM(str, ptr, len); + + VALUE orig_str = str; + RSTRING_GETMEM(orig_str, ptr, len); + str = rb_enc_str_new(0, len + 1, enc); dest = RSTRING_PTR(str); memcpy(dest + 1, ptr, len); + + RB_GC_GUARD(orig_str); } dest[0] = ':'; return str; diff --git a/test/ruby/test_symbol.rb b/test/ruby/test_symbol.rb index 1d2a18d734c8e2..7f75ecd90e8361 100644 --- a/test/ruby/test_symbol.rb +++ b/test/ruby/test_symbol.rb @@ -118,6 +118,12 @@ def test_inspect end end + def test_inspect_under_gc_compact_stress + EnvUtil.under_gc_compact_stress do + assert_inspect_evaled(':testing') + end + end + def test_name assert_equal("foo", :foo.name) assert_same(:foo.name, :foo.name)