Add more necessary USE_PARALLEL_SWEEP guards

test-all still not working when configured without --enable-parallel-sweep

Author: luke-gruber

concurrent_set.c

@@ -761,10 +761,11 @@ VALUE
 rb_concurrent_set_delete_by_identity(VALUE *set_obj_ptr, VALUE key)
 {
     VALUE result;
-    bool is_sweep_thread_p(void);
 
     VALUE set_obj = rbimpl_atomic_value_load(set_obj_ptr, RBIMPL_ATOMIC_ACQUIRE);
 
+#if USE_PARALLEL_SWEEP
+    bool is_sweep_thread_p(void);
     if (is_sweep_thread_p()) {
         while (1) {
             bool lock_taken = resize_lock_rdlock();
@@ -783,7 +784,9 @@ rb_concurrent_set_delete_by_identity(VALUE *set_obj_ptr, VALUE key)
             if (lock_taken) resize_lock_rdunlock();
         }
     }
-    else {
+    else
+#endif
+    {
         result = rb_concurrent_set_delete_by_identity_locked(set_obj, key);
     }
     return result;

error.c

@@ -1117,16 +1117,20 @@ rb_bug_without_die(const char *fmt, ...)
     va_end(args);
 }
 
+#if USE_PARALLEL_SWEEP
 bool is_sweep_thread_p(void);
+#endif
 
 void
 rb_bug(const char *fmt, ...)
 {
     va_list args;
     va_start(args, fmt);
+#if USE_PARALLEL_SWEEP
     if (is_sweep_thread_p()) {
         fprintf(stderr, "rb_bug() called from sweep_thread!\n");
     }
+#endif
     rb_bug_without_die_internal(fmt, args);
     va_end(args);
     die();

gc.c

@@ -151,18 +151,22 @@ rb_gc_vm_unlock(unsigned int lev, const char *file, int line)
     rb_vm_lock_leave(&lev, file, line);
 }
 
+#if USE_PARALLEL_SWEEP
 bool
 is_sweep_thread_p(void)
 {
     rb_vm_t *vm = GET_VM();
     if (!vm) return false;
     return vm->gc.sweep_thread == pthread_self();
 }
+#endif
 
 unsigned int
 rb_gc_cr_lock(const char *file, int line)
 {
+#if USE_PARALLEL_SWEEP
     GC_ASSERT(!is_sweep_thread_p());
+#endif
     unsigned int lev;
     rb_vm_lock_enter_cr(GET_RACTOR(), &lev, file, line);
     return lev;
@@ -171,7 +175,9 @@ rb_gc_cr_lock(const char *file, int line)
 void
 rb_gc_cr_unlock(unsigned int lev, const char *file, int line)
 {
+#if USE_PARALLEL_SWEEP
     GC_ASSERT(!is_sweep_thread_p());
+#endif
     rb_vm_lock_leave_cr(GET_RACTOR(), &lev, file, line);
 }
 
@@ -2497,6 +2503,7 @@ obj_free_object_id(VALUE obj, bool in_user_gc_thread)
     return true;
 }
 
+#if USE_PARALLEL_SWEEP
 bool
 rb_gc_obj_free_concurrency_safe_vm_weak_references(VALUE obj)
 {
@@ -2521,6 +2528,7 @@ rb_gc_obj_free_concurrency_safe_vm_weak_references(VALUE obj)
     }
     return result;
 }
+#endif
 
 void
 rb_gc_obj_free_vm_weak_references(VALUE obj)