summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Zhu <peter@peterzhu.ca>2023-07-14 09:41:28 -0400
committerPeter Zhu <peter@peterzhu.ca>2023-07-14 13:53:20 -0400
commit914b657a2bf9f2c67453473447f81e878b366206 (patch)
tree8f812b215430ca5bcaf2b330d39ed1f7bdce84a8
parentebb7552e6d19c07ea9cd79b42e960c684038a1f0 (diff)
Remove unused branch in write barrier
The branch doesn't compile, so it's probably not used.
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/8073
-rw-r--r--gc.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/gc.c b/gc.c
index faaf095fae..bdcc3ebe6f 100644
--- a/gc.c
+++ b/gc.c
@@ -8792,7 +8792,6 @@ gc_writebarrier_generational(VALUE a, VALUE b, rb_objspace_t *objspace)
if (is_incremental_marking(objspace)) rb_bug("gc_writebarrier_generational: called while incremental marking: %s -> %s", obj_info(a), obj_info(b));
}
-#if 1
/* mark `a' and remember (default behavior) */
if (!rgengc_remembered(objspace, a)) {
RB_VM_LOCK_ENTER_NO_BARRIER();
@@ -8802,19 +8801,6 @@ gc_writebarrier_generational(VALUE a, VALUE b, rb_objspace_t *objspace)
RB_VM_LOCK_LEAVE_NO_BARRIER();
gc_report(1, objspace, "gc_writebarrier_generational: %s (remembered) -> %s\n", obj_info(a), obj_info(b));
}
-#else
- /* mark `b' and remember */
- MARK_IN_BITMAP(GET_HEAP_MARK_BITS(b), b);
- if (RVALUE_WB_UNPROTECTED(b)) {
- gc_remember_unprotected(objspace, b);
- }
- else {
- RVALUE_AGE_SET_OLD(objspace, b);
- rgengc_remember(objspace, b);
- }
-
- gc_report(1, objspace, "gc_writebarrier_generational: %s -> %s (remembered)\n", obj_info(a), obj_info(b));
-#endif
check_rvalue_consistency(a);
check_rvalue_consistency(b);