Add ASSERT_vm_unlocking() to vm_call0_body

This uncovered many more test failures.

Author: luke-gruber

depend

@@ -14795,7 +14795,9 @@ ruby.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
 ruby.$(OBJEXT): {$(VPATH)}thread_native.h
 ruby.$(OBJEXT): {$(VPATH)}util.h
 ruby.$(OBJEXT): {$(VPATH)}vm_core.h
+ruby.$(OBJEXT): {$(VPATH)}vm_debug.h
 ruby.$(OBJEXT): {$(VPATH)}vm_opts.h
+ruby.$(OBJEXT): {$(VPATH)}vm_sync.h
 ruby.$(OBJEXT): {$(VPATH)}yjit.h
 ruby_parser.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 ruby_parser.$(OBJEXT): $(top_srcdir)/internal/array.h

encoding.c

@@ -345,6 +345,7 @@ static int
 enc_table_expand(struct enc_table *enc_table, int newsize)
 {
     if (newsize > ENCODING_LIST_CAPA) {
+        RB_VM_UNLOCK();
         rb_raise(rb_eEncodingError, "too many encoding (> %d)", ENCODING_LIST_CAPA);
     }
     return newsize;
@@ -491,9 +492,11 @@ static void
 enc_check_addable(struct enc_table *enc_table, const char *name)
 {
     if (enc_registered(enc_table, name) >= 0) {
+        RB_VM_UNLOCK();
         rb_raise(rb_eArgError, "encoding %s is already registered", name);
     }
     else if (!valid_encoding_name_p(name)) {
+        RB_VM_UNLOCK();
         rb_raise(rb_eArgError, "invalid encoding name: %s", name);
     }
 }
@@ -541,7 +544,10 @@ enc_replicate(struct enc_table *enc_table, const char *name, rb_encoding *encodi
 
     enc_check_addable(enc_table, name);
     idx = enc_register(enc_table, name, encoding);
-    if (idx < 0) rb_raise(rb_eArgError, "invalid encoding name: %s", name);
+    if (idx < 0) {
+        RB_VM_UNLOCK();
+        rb_raise(rb_eArgError, "invalid encoding name: %s", name);
+    }
     set_base_encoding(enc_table, idx, encoding);
     return idx;
 }
@@ -559,6 +565,7 @@ enc_replicate_with_index(struct enc_table *enc_table, const char *name, rb_encod
         set_base_encoding(enc_table, idx, origenc);
     }
     else {
+        RB_VM_UNLOCK();
         rb_raise(rb_eArgError, "failed to replicate encoding");
     }
     return idx;
@@ -885,7 +892,7 @@ int
 rb_enc_find_index(const char *name)
 {
     int i;
-#if RUBY_DEBUG > 0
+#if RUBY_DEBUG
     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
     }

eval.c

@@ -2078,7 +2078,14 @@ errat_getter(ID id, VALUE *_)
 {
     VALUE err = get_errinfo();
     if (!NIL_P(err)) {
-        return rb_get_backtrace(err);
+        VALUE bt;
+        RB_VM_UNLOCK();
+        {
+            bt = rb_get_backtrace(err);
+        }
+        RB_VM_LOCK();
+
+        return bt;
     }
     else {
         return Qnil;
@@ -2089,10 +2096,14 @@ static void
 errat_setter(VALUE val, ID id, VALUE *var)
 {
     VALUE err = get_errinfo();
-    if (NIL_P(err)) {
-        rb_raise(rb_eArgError, "$! not set");
+    RB_VM_UNLOCK();
+    {
+        if (NIL_P(err)) {
+            rb_raise(rb_eArgError, "$! not set");
+        }
+        set_backtrace(err, val);
     }
-    set_backtrace(err, val);
+    RB_VM_LOCK();
 }
 
 /*

gc/default/default.c

@@ -2765,20 +2765,23 @@ rb_gc_impl_define_finalizer(void *objspace_ptr, VALUE obj, VALUE block)
 
     if (st_lookup(finalizer_table, obj, &data)) {
         table = (VALUE)data;
+        VALUE dup_table = rb_ary_dup(table);
 
+        RB_GC_VM_UNLOCK(lev);
         /* avoid duplicate block, table is usually small */
         {
             long len = RARRAY_LEN(table);
             long i;
 
             for (i = 0; i < len; i++) {
-                VALUE recv = RARRAY_AREF(table, i);
-                if (rb_equal(recv, block)) { // TODO: unsafe, can context switch
-                    RB_GC_VM_UNLOCK(lev);
+                VALUE recv = RARRAY_AREF(dup_table, i);
+                if (rb_equal(recv, block)) { // can't be called with VM lock held
                     return recv;
                 }
             }
         }
+        lev = RB_GC_VM_LOCK();
+        RB_GC_GUARD(dup_table);
 
         rb_ary_push(table, block);
     }

io.c

@@ -8675,7 +8675,11 @@ deprecated_str_setter(VALUE val, ID id, VALUE *var)
 {
     rb_str_setter(val, id, &val);
     if (!NIL_P(val)) {
-        rb_warn_deprecated("'%s'", NULL, rb_id2name(id));
+        RB_VM_UNLOCK();
+        {
+            rb_warn_deprecated("'%s'", NULL, rb_id2name(id));
+        }
+        RB_VM_LOCK();
     }
     *var = val;
 }
@@ -8684,17 +8688,21 @@ static void
 deprecated_rs_setter(VALUE val, ID id, VALUE *var)
 {
     if (!NIL_P(val)) {
-        if (!RB_TYPE_P(val, T_STRING)) {
-            rb_raise(rb_eTypeError, "value of %"PRIsVALUE" must be String", rb_id2str(id));
-        }
-        if (rb_str_equal(val, rb_default_rs)) {
-            val = rb_default_rs;
-        }
-        else {
-            val = rb_str_frozen_bare_string(val);
+        RB_VM_UNLOCK();
+        {
+            if (!RB_TYPE_P(val, T_STRING)) {
+                rb_raise(rb_eTypeError, "value of %"PRIsVALUE" must be String", rb_id2str(id));
+            }
+            if (rb_str_equal(val, rb_default_rs)) {
+                val = rb_default_rs;
+            }
+            else {
+                val = rb_str_frozen_bare_string(val);
+            }
+            rb_enc_str_coderange(val);
+            rb_warn_deprecated("'%s'", NULL, rb_id2name(id));
         }
-        rb_enc_str_coderange(val);
-        rb_warn_deprecated("'%s'", NULL, rb_id2name(id));
+        RB_VM_LOCK();
     }
     *var = val;
 }
@@ -9246,7 +9254,11 @@ stdin_getter(ID id, VALUE *ptr)
 static void
 stdout_setter(VALUE val, ID id, VALUE *ptr)
 {
-    must_respond_to(id_write, val, id);
+    RB_VM_UNLOCK();
+    {
+        must_respond_to(id_write, val, id);
+    }
+    RB_VM_LOCK();
     rb_ractor_stdout_set(val);
 }
 
@@ -9259,7 +9271,11 @@ stdout_getter(ID id, VALUE *ptr)
 static void
 stderr_setter(VALUE val, ID id, VALUE *ptr)
 {
-    must_respond_to(id_write, val, id);
+    RB_VM_UNLOCK();
+    {
+        must_respond_to(id_write, val, id);
+    }
+    RB_VM_LOCK();
     rb_ractor_stderr_set(val);
 }
 

ractor.c

@@ -1374,10 +1374,15 @@ make_shareable_check_shareable(VALUE obj)
     }
     else if (!allow_frozen_shareable_p(obj)) {
         if (rb_obj_is_proc(obj)) {
-            rb_proc_ractor_make_shareable(obj);
+            int lev = RB_VM_UNLOCK_ALL();
+            {
+                rb_proc_ractor_make_shareable(obj);
+            }
+            RB_VM_RELOCK_ALL(lev);
             return traverse_cont;
         }
         else {
+            (void)RB_VM_UNLOCK_ALL();
             rb_raise(rb_eRactorError, "can not make shareable object for %+"PRIsVALUE, obj);
         }
     }

re.c

@@ -4627,7 +4627,9 @@ static void
 match_setter(VALUE val, ID _x, VALUE *_y)
 {
     if (!NIL_P(val)) {
+        RB_VM_UNLOCK();
         Check_Type(val, T_MATCH);
+        RB_VM_LOCK();
     }
     rb_backref_set(val);
 }

ruby.c

@@ -42,6 +42,7 @@
 
 #include "dln.h"
 #include "eval_intern.h"
+#include "vm_sync.h"
 #include "internal.h"
 #include "internal/cmdlineopt.h"
 #include "internal/cont.h"
@@ -3019,10 +3020,13 @@ ruby_setproctitle(VALUE title)
 static void
 set_arg0(VALUE val, ID id, VALUE *_)
 {
-    if (origarg.argv == 0)
+    RB_VM_UNLOCK();
+    if (origarg.argv == 0) {
         rb_raise(rb_eRuntimeError, "$0 not initialized");
+    }
 
     rb_progname = rb_str_new_frozen(ruby_setproctitle(val));
+    RB_VM_LOCK();
 }
 
 static inline VALUE

string.c

@@ -11444,6 +11444,7 @@ void
 rb_str_setter(VALUE val, ID id, VALUE *var)
 {
     if (!NIL_P(val) && !RB_TYPE_P(val, T_STRING)) {
+        RB_VM_UNLOCK_ALL();
         rb_raise(rb_eTypeError, "value of %"PRIsVALUE" must be String", rb_id2str(id));
     }
     *var = val;
@@ -11452,15 +11453,19 @@ rb_str_setter(VALUE val, ID id, VALUE *var)
 static void
 rb_fs_setter(VALUE val, ID id, VALUE *var)
 {
-    val = rb_fs_check(val);
-    if (!val) {
-        rb_raise(rb_eTypeError,
-                 "value of %"PRIsVALUE" must be String or Regexp",
-                 rb_id2str(id));
-    }
-    if (!NIL_P(val)) {
-        rb_warn_deprecated("'$;'", NULL);
+    RB_VM_UNLOCK();
+    {
+        val = rb_fs_check(val);
+        if (!val) {
+            rb_raise(rb_eTypeError,
+                    "value of %"PRIsVALUE" must be String or Regexp",
+                    rb_id2str(id));
+        }
+        if (!NIL_P(val)) {
+                rb_warn_deprecated("'$;'", NULL);
+        }
     }
+    RB_VM_LOCK();
     *var = val;
 }
 

transcode.c

@@ -1856,13 +1856,9 @@ rb_econv_asciicompat_encoding(const char *ascii_incompat_name)
                     RB_VM_LOCK_ENTER_LEV(&lev);
                 }
                 else {
-#if RUBY_DEBUG > 0
                     RB_VM_LOCK_LEAVE_LEV(&lev);
-#endif
                     st_foreach(table2, asciicompat_encoding_i, (st_data_t)&data);
-#if RUBY_DEBUG > 0
                     RB_VM_LOCK_ENTER_LEV(&lev);
-#endif
                 }
             }