From cc048f7571c5d054b04dad39cb61d008b30f663a Mon Sep 17 00:00:00 2001
From: Benoit Daloze <eregontp@gmail.com>
Date: Tue, 16 Dec 2025 16:23:29 +0100
Subject: [PATCH] Revert "ZJIT: Do not call rb_gc_writebarrier() with an
 immediate value in gen_write_barrier()"

* This reverts commit 623559faa3dd0927b4034a752226a30ae8821604.
* There is an issue with the jump in LIR, see https://github.com/ruby/ruby/pull/15542.
---
 zjit/src/codegen.rs      | 26 +++-----------------------
 zjit/src/hir_type/mod.rs |  4 ----
 2 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/zjit/src/codegen.rs b/zjit/src/codegen.rs
index f14e4cdce4..7c33473314 100644
--- a/zjit/src/codegen.rs
+++ b/zjit/src/codegen.rs
@@ -1130,31 +1130,11 @@ fn gen_store_field(asm: &mut Assembler, recv: Opnd, id: ID, offset: i32, val: Op
 }
 
 fn gen_write_barrier(asm: &mut Assembler, recv: Opnd, val: Opnd, val_type: Type) {
-    // See RB_OBJ_WRITE/rb_obj_write: it's just assignment and rb_obj_written().
-    // rb_obj_written() does: if (!RB_SPECIAL_CONST_P(val)) { rb_gc_writebarrier(recv, val); }
-    if val_type.is_immediate() {
-        return;
-    } else if val_type.is_heap_object() {
-        asm_comment!(asm, "Write barrier with known heap object value");
+    // See RB_OBJ_WRITE/rb_obj_write: it's just assignment and rb_obj_written()->rb_gc_writebarrier()
+    if !val_type.is_immediate() {
+        asm_comment!(asm, "Write barrier");
         let recv = asm.load(recv);
         asm_ccall!(asm, rb_gc_writebarrier, recv, val);
-    } else {
-        // Unknown if immediate or not, need to check because rb_gc_writebarrier() assumes not immediate
-        asm_comment!(asm, "Write barrier with unknown value");
-        let no_wb = asm.new_label("no_write_barrier_for_immediate");
-
-        // Continue if special constant
-        asm.test(val, Opnd::UImm(RUBY_IMMEDIATE_MASK as u64));
-        asm.jnz(no_wb.clone());
-
-        // Continue if false
-        asm.cmp(val, Qfalse.into());
-        asm.je(no_wb.clone());
-
-        let recv = asm.load(recv);
-        asm_ccall!(asm, rb_gc_writebarrier, recv, val);
-
-        asm.write_label(no_wb);
     }
 }
 
diff --git a/zjit/src/hir_type/mod.rs b/zjit/src/hir_type/mod.rs
index 8ee90a8790..c87f1313b5 100644
--- a/zjit/src/hir_type/mod.rs
+++ b/zjit/src/hir_type/mod.rs
@@ -517,10 +517,6 @@ impl Type {
         self.is_subtype(types::Immediate)
     }
 
-    pub fn is_heap_object(&self) -> bool {
-        self.is_subtype(types::HeapBasicObject)
-    }
-
     pub fn print(self, ptr_map: &PtrPrintMap) -> TypePrinter<'_> {
         TypePrinter { inner: self, ptr_map }
     }