Compile putchilledstring when frozen_string_literal is undefined

etiennebarrie · byroot · etiennebarrie · commit 0b61e418f042 · 2024-03-11T10:44:15.000+01:00
Co-authored-by: Jean Boussier &lt;byroot@ruby-lang.org&gt;
diff --git a/bootstraptest/test_ractor.rb b/bootstraptest/test_ractor.rb
@@ -1662,7 +1662,7 @@ class C8; def self.foo = 17; end
   Warning[:experimental] = $VERBOSE = true
   STDERR.reopen(STDOUT)
   eval("Ractor.new{}.take", nil, "test_ractor.rb", 1)
-}
+}, frozen_string_literal: false
 
 # check moved object
 assert_equal 'ok', %q{
diff --git a/compile.c b/compile.c
@@ -10355,12 +10355,18 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const no
         debugp_param("nd_lit", get_string_value(node));
         if (!popped) {
             VALUE lit = get_string_value(node);
-            if (!frozen_string_literal_p(iseq)) {
+            switch (ISEQ_COMPILE_DATA(iseq)->option->frozen_string_literal) {
+              case -1: // unspecified
+                lit = rb_fstring(lit);
+                ADD_INSN1(ret, node, putchilledstring, lit);
+                RB_OBJ_WRITTEN(iseq, Qundef, lit);
+                break;
+              case 0: // disabled
                 lit = rb_fstring(lit);
                 ADD_INSN1(ret, node, putstring, lit);
                 RB_OBJ_WRITTEN(iseq, Qundef, lit);
-            }
-            else {
+                break;
+              case 1: // enabled
                 if (ISEQ_COMPILE_DATA(iseq)->option->debug_frozen_string_literal || RTEST(ruby_debug)) {
                     VALUE debug_info = rb_ary_new_from_args(2, rb_iseq_path(iseq), INT2FIX(line));
                     lit = rb_str_dup(lit);
@@ -10372,6 +10378,9 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const no
                 }
                 ADD_INSN1(ret, node, putobject, lit);
                 RB_OBJ_WRITTEN(iseq, Qundef, lit);
+                break;
+              default:
+                rb_bug("invalid frozen_string_literal");
             }
         }
         break;
