Some fixes for global variables

Author: luke-gruber

depend

@@ -4199,7 +4199,9 @@ encoding.$(OBJEXT): $(top_srcdir)/internal/gc.h
 encoding.$(OBJEXT): $(top_srcdir)/internal/imemo.h
 encoding.$(OBJEXT): $(top_srcdir)/internal/inits.h
 encoding.$(OBJEXT): $(top_srcdir)/internal/load.h
+encoding.$(OBJEXT): $(top_srcdir)/internal/namespace.h
 encoding.$(OBJEXT): $(top_srcdir)/internal/object.h
+encoding.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
 encoding.$(OBJEXT): $(top_srcdir)/internal/serial.h
 encoding.$(OBJEXT): $(top_srcdir)/internal/set_table.h
 encoding.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
@@ -13362,6 +13364,7 @@ re.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
 re.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 re.$(OBJEXT): {$(VPATH)}config.h
 re.$(OBJEXT): {$(VPATH)}constant.h
+re.$(OBJEXT): {$(VPATH)}debug_counter.h
 re.$(OBJEXT): {$(VPATH)}defines.h
 re.$(OBJEXT): {$(VPATH)}encindex.h
 re.$(OBJEXT): {$(VPATH)}encoding.h
@@ -13545,6 +13548,7 @@ re.$(OBJEXT): {$(VPATH)}util.h
 re.$(OBJEXT): {$(VPATH)}vm_core.h
 re.$(OBJEXT): {$(VPATH)}vm_debug.h
 re.$(OBJEXT): {$(VPATH)}vm_opts.h
+re.$(OBJEXT): {$(VPATH)}vm_sync.h
 regcomp.$(OBJEXT): $(hdrdir)/ruby.h
 regcomp.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 regcomp.$(OBJEXT): {$(VPATH)}assert.h

encoding.c

@@ -28,6 +28,7 @@
 #include "ruby/encoding.h"
 #include "ruby/util.h"
 #include "ruby_assert.h"
+#include "vm_core.h"
 #include "vm_sync.h"
 #include "ruby_atomic.h"
 
@@ -866,7 +867,11 @@ int
 rb_enc_find_index(const char *name)
 {
     int i;
-    ASSERT_vm_unlocking(); // it needs to be unlocked so it can call `load_encoding` if necessary
+#if RUBY_DEBUG > 0
+    if (rb_multi_ractor_p() || !rb_enc_registered(name)) {
+        ASSERT_vm_unlocking(); // it needs to be unlocked so it can call `load_encoding` if necessary
+    }
+#endif
     GLOBAL_ENC_TABLE_LOCKING(enc_table) {
         i = enc_registered(enc_table, name);
     }

re.c

@@ -24,6 +24,7 @@
 #include "internal/object.h"
 #include "internal/ractor.h"
 #include "internal/variable.h"
+#include "vm_sync.h"
 #include "regint.h"
 #include "ruby/encoding.h"
 #include "ruby/re.h"
@@ -4588,14 +4589,22 @@ rb_reg_regsub(VALUE str, VALUE src, struct re_registers *regs, VALUE regexp)
 static VALUE
 ignorecase_getter(ID _x, VALUE *_y)
 {
-    rb_category_warn(RB_WARN_CATEGORY_DEPRECATED, "variable $= is no longer effective");
+    RB_VM_UNLOCK();
+    {
+        rb_category_warn(RB_WARN_CATEGORY_DEPRECATED, "variable $= is no longer effective");
+    }
+    RB_VM_LOCK();
     return Qfalse;
 }
 
 static void
 ignorecase_setter(VALUE val, ID id, VALUE *_)
 {
-    rb_category_warn(RB_WARN_CATEGORY_DEPRECATED, "variable $= is no longer effective; ignored");
+    RB_VM_UNLOCK();
+    {
+        rb_category_warn(RB_WARN_CATEGORY_DEPRECATED, "variable $= is no longer effective; ignored");
+    }
+    RB_VM_LOCK();
 }
 
 static VALUE

variable.c

@@ -986,17 +986,19 @@ rb_gvar_set_entry(struct rb_global_entry *entry, VALUE val)
 {
     struct trace_data trace;
     struct rb_global_variable *var = entry->var;
-    RB_VM_UNLOCK();
 
     (*var->setter)(val, entry->id, var->data);
 
     if (var->trace && !var->block_trace) {
         var->block_trace = 1;
         trace.trace = var->trace;
         trace.val = val;
-        rb_ensure(trace_ev, (VALUE)&trace, trace_en, (VALUE)var);
+        RB_VM_UNLOCK();
+        {
+            rb_ensure(trace_ev, (VALUE)&trace, trace_en, (VALUE)var);
+        }
+        RB_VM_LOCK();
     }
-    RB_VM_LOCK();
     return val;
 }
 
@@ -1050,9 +1052,13 @@ rb_gvar_get(ID id)
             }
             else {
                 retval = (*var->getter)(entry->id, var->data);
-                if (rb_obj_respond_to(retval, rb_intern("clone"), 1)) {
-                    retval = rb_funcall(retval, rb_intern("clone"), 0);
+                RB_VM_UNLOCK();
+                {
+                    if (rb_obj_respond_to(retval, rb_intern("clone"), 1)) {
+                        retval = rb_funcall(retval, rb_intern("clone"), 0);
+                    }
                 }
+                RB_VM_LOCK();
                 rb_hash_aset(gvars, key, retval);
             }
         }