tmp

Author: luke-gruber

gc/default/default.c

@@ -5525,10 +5525,9 @@ gc_sweep_continue(rb_objspace_t *objspace, rb_heap_t *sweep_heap)
                     heap->pre_swept_slots_deferred = 0;
                 }
                 if (num_heaps_need_continue > 0) {
+                    objspace->sweep_thread_sweep_requested = true;
                     if (!objspace->sweep_thread_sweeping && !objspace->sweep_thread_sweep_requested) {
                         psweep_debug(-2, "[gc] gc_sweep_continue: requesting sweep thread\n");
-                        objspace->sweep_thread_sweep_requested = true;
-                        rb_native_cond_broadcast(&objspace->sweep_cond);
                     }
                     else {
                         psweep_debug(-2, "[gc] gc_sweep_continue: sweep thread restart heaps\n");
@@ -5542,11 +5541,16 @@ gc_sweep_continue(rb_objspace_t *objspace, rb_heap_t *sweep_heap)
         }
     }
     sweep_lock_unlock(&objspace->sweep_lock);
+    if (num_heaps_need_continue > 0) {
+        rb_native_cond_broadcast(&objspace->sweep_cond);
+    }
     bool sweep_backwards = num_heaps_need_continue > 0 && !heaps[0].skip_sweep_continue;
 
 #if PSWEEP_LOCK_STATS > 0
     current_step_type = 1;
-    step_contention[1].step_count++;
+    if (num_heaps_need_continue) {
+        step_contention[1].step_count++;
+    }
 #endif
     for (int i = sweep_heap_first(sweep_backwards); i != sweep_heap_last(sweep_backwards); sweep_heap_iter(sweep_backwards, &i)) {
         rb_heap_t *heap = &heaps[i];

shape.h

@@ -440,7 +440,7 @@ rb_shape_obj_has_fields(VALUE obj)
 static inline bool
 rb_obj_gen_fields_p(VALUE obj)
 {
-    switch (TYPE(obj)) {
+    switch (BUILTIN_TYPE(obj)) {
         case T_NONE:
         case T_OBJECT:
         case T_CLASS: