symbol.c: simplify dup_string_for_create

byroot · byroot · commit befd51037aa2 · 2025-07-22T17:38:20.000+02:00
NB: `str` may be a fake string when the caller is `intern3` or similar.

- Use `rb_bare_fstring`, which accept STR_FAKESTR and non-bare strings.
- Check for ASCII strings with encindex.
- Skip checking for ASCII compatibility.
- Skip duping the string.
diff --git a/symbol.c b/symbol.c
@@ -167,11 +167,9 @@ sym_set_cmp(VALUE a, VALUE b)
     return rb_str_hash_cmp(sym_set_sym_get_str(a), sym_set_sym_get_str(b)) == false;
 }
 
-
 static int
 sym_check_asciionly(VALUE str, bool fake_str)
 {
-    if (!rb_enc_asciicompat(rb_enc_get(str))) return FALSE;
     switch (rb_enc_str_coderange(str)) {
       case ENC_CODERANGE_BROKEN:
         if (fake_str) {
@@ -188,19 +186,12 @@ sym_check_asciionly(VALUE str, bool fake_str)
 static VALUE
 dup_string_for_create(VALUE str)
 {
-    rb_encoding *enc = rb_enc_get(str);
-
-    str = rb_enc_str_new(RSTRING_PTR(str), RSTRING_LEN(str), enc);
+    int encidx = ENCODING_GET(str);
 
-    rb_encoding *ascii = rb_usascii_encoding();
-    if (enc != ascii && sym_check_asciionly(str, false)) {
-        rb_enc_associate(str, ascii);
+    if (encidx != rb_usascii_encindex() && sym_check_asciionly(str, true)) {
+        return rb_enc_interned_str(RSTRING_PTR(str), RSTRING_LEN(str), rb_usascii_encoding());
     }
-    OBJ_FREEZE(str);
-
-    str = rb_fstring(str);
-
-    return str;
+    return rb_bare_fstring(str);
 }
 
 static int
diff --git a/test/ruby/test_symbol.rb b/test/ruby/test_symbol.rb
@@ -20,6 +20,28 @@ def test_intern
     assert_equal(':"foo=="', "foo==".intern.inspect)
   end
 
+  def test_intern_bare_string
+    random = "str#{rand}"
+    random.instance_variable_set(:@ivar, 1)
+    random.freeze
+    str = random.to_sym.name
+    assert_equal [], str.instance_variables
+
+    random = Class.new(String).new("str#{rand}").freeze
+    str = random.to_sym.name
+    assert_equal String, str.class
+
+    random = "utf8™#{rand}"
+    random.instance_variable_set(:@ivar, 1)
+    random.freeze
+    str = random.to_sym.name
+    assert_equal [], str.instance_variables
+
+    random = Class.new(String).new("utf8™#{rand}").freeze
+    str = random.to_sym.name
+    assert_equal String, str.class
+  end
+
   def test_all_symbols
     x = Symbol.all_symbols
     assert_kind_of(Array, x)
