From 305253b20cdec02491dfdcc308af128f086c4d7f Mon Sep 17 00:00:00 2001
From: Takashi Kokubun <takashikkbn@gmail.com>
Date: Tue, 19 Aug 2025 09:58:24 -0700
Subject: [PATCH] ZJIT: Remove try_num_bits

---
 zjit/src/backend/lir.rs | 25 +++++++------------------
 zjit/src/codegen.rs     |  4 ++--
 2 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/zjit/src/backend/lir.rs b/zjit/src/backend/lir.rs
index 460e2719dd9a38..be5bda052d1a5d 100644
--- a/zjit/src/backend/lir.rs
+++ b/zjit/src/backend/lir.rs
@@ -147,26 +147,15 @@ impl Opnd
         }
     }
 
-    /// Return Some(Opnd) with a given num_bits if self has num_bits.
-    /// None if self doesn't have a num_bits field.
-    pub fn try_num_bits(&self, num_bits: u8) -> Option<Opnd> {
-        assert!(num_bits == 8 || num_bits == 16 || num_bits == 32 || num_bits == 64);
-        match *self {
-            Opnd::Reg(reg) => Some(Opnd::Reg(reg.with_num_bits(num_bits))),
-            Opnd::Mem(Mem { base, disp, .. }) => Some(Opnd::Mem(Mem { base, disp, num_bits })),
-            Opnd::VReg { idx, .. } => Some(Opnd::VReg { idx, num_bits }),
-            _ => None,
-        }
-    }
-
-    /// Return Opnd with a given num_bits if self has num_bits.
-    /// Panic otherwise. This should be used only when you know which Opnd self is.
+    /// Return Opnd with a given num_bits if self has num_bits. Panic otherwise.
     #[track_caller]
     pub fn with_num_bits(&self, num_bits: u8) -> Opnd {
-        if let Some(opnd) = self.try_num_bits(num_bits) {
-            opnd
-        } else {
-            unreachable!("with_num_bits should not be used on: {self:?}");
+        assert!(num_bits == 8 || num_bits == 16 || num_bits == 32 || num_bits == 64);
+        match *self {
+            Opnd::Reg(reg) => Opnd::Reg(reg.with_num_bits(num_bits)),
+            Opnd::Mem(Mem { base, disp, .. }) => Opnd::Mem(Mem { base, disp, num_bits }),
+            Opnd::VReg { idx, .. } => Opnd::VReg { idx, num_bits },
+            _ => unreachable!("with_num_bits should not be used for: {self:?}"),
         }
     }
 
diff --git a/zjit/src/codegen.rs b/zjit/src/codegen.rs
index 5fb83b5f48a5fa..c588a93651fe6a 100644
--- a/zjit/src/codegen.rs
+++ b/zjit/src/codegen.rs
@@ -1183,8 +1183,8 @@ fn gen_guard_type(jit: &mut JITState, asm: &mut Assembler, val: lir::Opnd, guard
         asm.jne(side_exit(jit, state, GuardType(guard_type)));
     } else if guard_type.is_subtype(types::StaticSymbol) {
         // Static symbols have (val & 0xff) == RUBY_SYMBOL_FLAG
-        // Use 8-bit comparison like YJIT does
-        debug_assert!(val.try_num_bits(8).is_some(), "GuardType should not be used for a known constant, but val was: {val:?}");
+        // Use 8-bit comparison like YJIT does. GuardType should not be used
+        // for a known VALUE, which with_num_bits() does not support.
         asm.cmp(val.with_num_bits(8), Opnd::UImm(RUBY_SYMBOL_FLAG as u64));
         asm.jne(side_exit(jit, state, GuardType(guard_type)));
     } else if guard_type.is_subtype(types::NilClass) {