Show singleton Type differently

tekknolagi · tekknolagi · commit a1e58ed87427 · 2025-07-17T10:31:14.000-04:00
diff --git a/jit.c b/jit.c
@@ -448,3 +448,9 @@ RB_SPECIAL_CONST_SHAPE_ID = SPECIAL_CONST_SHAPE_ID;
 
 const uint32_t
 RB_INVALID_SHAPE_ID = INVALID_SHAPE_ID;
+
+bool
+rb_zjit_singleton_class_p(VALUE klass)
+{
+    return RCLASS_SINGLETON_P(klass);
+}
diff --git a/zjit/bindgen/src/main.rs b/zjit/bindgen/src/main.rs
@@ -351,6 +351,7 @@ fn main() {
         .allowlist_function("rb_optimized_call")
         .allowlist_function("rb_zjit_icache_invalidate")
         .allowlist_function("rb_zjit_print_exception")
+        .allowlist_function("rb_zjit_singleton_class_p")
         .allowlist_type("robject_offsets")
         .allowlist_type("rstring_offsets")
 
diff --git a/zjit/src/cruby_bindings.inc.rs b/zjit/src/cruby_bindings.inc.rs
diff --git a/zjit/src/hir.rs b/zjit/src/hir.rs
@@ -5498,7 +5498,7 @@ mod opt_tests {
             fn test@<compiled>:5:
             bb0(v0:BasicObject):
               PatchPoint MethodRedefined(Object@0x1000, foo@0x1008)
-              v6:BasicObject[class_exact:Object] = GuardType v0, BasicObject[class_exact:Object]
+              v6:BasicObject[class_exact*:Object@VALUE(0x1000)] = GuardType v0, BasicObject[class_exact*:Object@VALUE(0x1000)]
               v7:BasicObject = SendWithoutBlockDirect v6, :foo (0x1010)
               Return v7
         "#]]);
@@ -5538,7 +5538,7 @@ mod opt_tests {
             fn test@<compiled>:6:
             bb0(v0:BasicObject):
               PatchPoint MethodRedefined(Object@0x1000, foo@0x1008)
-              v6:BasicObject[class_exact:Object] = GuardType v0, BasicObject[class_exact:Object]
+              v6:BasicObject[class_exact*:Object@VALUE(0x1000)] = GuardType v0, BasicObject[class_exact*:Object@VALUE(0x1000)]
               v7:BasicObject = SendWithoutBlockDirect v6, :foo (0x1010)
               Return v7
         "#]]);
@@ -5557,7 +5557,7 @@ mod opt_tests {
             bb0(v0:BasicObject):
               v2:Fixnum[3] = Const Value(3)
               PatchPoint MethodRedefined(Object@0x1000, Integer@0x1008)
-              v7:BasicObject[class_exact:Object] = GuardType v0, BasicObject[class_exact:Object]
+              v7:BasicObject[class_exact*:Object@VALUE(0x1000)] = GuardType v0, BasicObject[class_exact*:Object@VALUE(0x1000)]
               v8:BasicObject = SendWithoutBlockDirect v7, :Integer (0x1010), v2
               Return v8
         "#]]);
@@ -5579,7 +5579,7 @@ mod opt_tests {
               v2:Fixnum[1] = Const Value(1)
               v3:Fixnum[2] = Const Value(2)
               PatchPoint MethodRedefined(Object@0x1000, foo@0x1008)
-              v8:BasicObject[class_exact:Object] = GuardType v0, BasicObject[class_exact:Object]
+              v8:BasicObject[class_exact*:Object@VALUE(0x1000)] = GuardType v0, BasicObject[class_exact*:Object@VALUE(0x1000)]
               v9:BasicObject = SendWithoutBlockDirect v8, :foo (0x1010), v2, v3
               Return v9
         "#]]);
@@ -5602,10 +5602,10 @@ mod opt_tests {
             fn test@<compiled>:7:
             bb0(v0:BasicObject):
               PatchPoint MethodRedefined(Object@0x1000, foo@0x1008)
-              v8:BasicObject[class_exact:Object] = GuardType v0, BasicObject[class_exact:Object]
+              v8:BasicObject[class_exact*:Object@VALUE(0x1000)] = GuardType v0, BasicObject[class_exact*:Object@VALUE(0x1000)]
               v9:BasicObject = SendWithoutBlockDirect v8, :foo (0x1010)
               PatchPoint MethodRedefined(Object@0x1000, bar@0x1018)
-              v11:BasicObject[class_exact:Object] = GuardType v0, BasicObject[class_exact:Object]
+              v11:BasicObject[class_exact*:Object@VALUE(0x1000)] = GuardType v0, BasicObject[class_exact*:Object@VALUE(0x1000)]
               v12:BasicObject = SendWithoutBlockDirect v11, :bar (0x1010)
               Return v12
         "#]]);
diff --git a/zjit/src/hir_type/mod.rs b/zjit/src/hir_type/mod.rs
@@ -1,6 +1,6 @@
 #![allow(non_upper_case_globals)]
 use crate::cruby::{Qfalse, Qnil, Qtrue, VALUE, RUBY_T_ARRAY, RUBY_T_STRING, RUBY_T_HASH, RUBY_T_CLASS, RUBY_T_MODULE};
-use crate::cruby::{rb_cInteger, rb_cFloat, rb_cArray, rb_cHash, rb_cString, rb_cSymbol, rb_cObject, rb_cTrueClass, rb_cFalseClass, rb_cNilClass, rb_cRange, rb_cSet, rb_cRegexp, rb_cClass, rb_cModule};
+use crate::cruby::{rb_cInteger, rb_cFloat, rb_cArray, rb_cHash, rb_cString, rb_cSymbol, rb_cObject, rb_cTrueClass, rb_cFalseClass, rb_cNilClass, rb_cRange, rb_cSet, rb_cRegexp, rb_cClass, rb_cModule, rb_zjit_singleton_class_p};
 use crate::cruby::ClassRelationship;
 use crate::cruby::get_class_name;
 use crate::cruby::ruby_sym_to_rust_string;
@@ -75,8 +75,14 @@ fn write_spec(f: &mut std::fmt::Formatter, printer: &TypePrinter) -> std::fmt::R
         Specialization::Object(val) if val == unsafe { rb_mRubyVMFrozenCore } => write!(f, "[VMFrozenCore]"),
         Specialization::Object(val) if ty.is_subtype(types::SymbolExact) => write!(f, "[:{}]", ruby_sym_to_rust_string(val)),
         Specialization::Object(val) => write!(f, "[{}]", val.print(printer.ptr_map)),
+        // TODO(max): Ensure singleton classes never have Type specialization
+        Specialization::Type(val) if unsafe { rb_zjit_singleton_class_p(val) } =>
+            write!(f, "[class*:{}@{}]", get_class_name(val), val.print(printer.ptr_map)),
         Specialization::Type(val) => write!(f, "[class:{}]", get_class_name(val)),
-        Specialization::TypeExact(val) => write!(f, "[class_exact:{}]", get_class_name(val)),
+        Specialization::TypeExact(val) if unsafe { rb_zjit_singleton_class_p(val) } =>
+            write!(f, "[class_exact*:{}@{}]", get_class_name(val), val.print(printer.ptr_map)),
+        Specialization::TypeExact(val) =>
+            write!(f, "[class_exact:{}]", get_class_name(val)),
         Specialization::Int(val) if ty.is_subtype(types::CBool) => write!(f, "[{}]", val != 0),
         Specialization::Int(val) if ty.is_subtype(types::CInt8) => write!(f, "[{}]", (val as i64) >> 56),
         Specialization::Int(val) if ty.is_subtype(types::CInt16) => write!(f, "[{}]", (val as i64) >> 48),
