ZJIT: Print CUInt64 in hex when sign bit is set

It's likely some sort of mask or flags. Hexadecimal is more compact.

Author: XrXr

zjit/src/hir.rs

@@ -399,6 +399,14 @@ impl<'a> std::fmt::Display for ConstPrinter<'a> {
             // We'll have to resolve that first.
             Const::CPtr(val) => write!(f, "CPtr({:?})", self.ptr_map.map_ptr(val)),
             &Const::CShape(shape_id) => write!(f, "CShape({:p})", self.ptr_map.map_shape(shape_id)),
+            &Const::CUInt64(int) => {
+                // Print in hex if signed bit is set
+                if 0 != int & (1 << (u64::BITS - 1)) {
+                    write!(f, "CUInt64(0x{int:x})")
+                } else {
+                    write!(f, "CUInt64({int})")
+                }
+            }
             _ => write!(f, "{:?}", self.inner),
         }
     }

zjit/src/hir/opt_tests.rs

@@ -7719,13 +7719,13 @@ mod hir_opt_tests {
           PatchPoint SingleRactorMode
           v11:HeapBasicObject = GuardType v6, HeapBasicObject
           v12:CUInt64 = LoadField v11, :_rbasic_flags@0x1000
-          v14:CUInt64[18446744069414584351] = Const CUInt64(18446744069414584351)
+          v14:CUInt64[0xffffffff0000001f] = Const CUInt64(0xffffffff0000001f)
           v15:CPtr[CPtr(0x1008)] = Const CPtr(0x1010)
           v16 = RefineType v15, CUInt64
           v17:CInt64 = IntAnd v12, v14
           v18:CBool = IsBitEqual v17, v16
           IfTrue v18, bb5()
-          v23:CUInt64[18446744069414584351] = Const CUInt64(18446744069414584351)
+          v23:CUInt64[0xffffffff0000001f] = Const CUInt64(0xffffffff0000001f)
           v24:CPtr[CPtr(0x1008)] = Const CPtr(0x1010)
           v25 = RefineType v24, CUInt64
           v26:CInt64 = IntAnd v12, v23
@@ -7795,13 +7795,13 @@ mod hir_opt_tests {
           PatchPoint SingleRactorMode
           v11:HeapBasicObject = GuardType v6, HeapBasicObject
           v12:CUInt64 = LoadField v11, :_rbasic_flags@0x1000
-          v14:CUInt64[18446744069414584351] = Const CUInt64(18446744069414584351)
+          v14:CUInt64[0xffffffff0000001f] = Const CUInt64(0xffffffff0000001f)
           v15:CPtr[CPtr(0x1008)] = Const CPtr(0x1010)
           v16 = RefineType v15, CUInt64
           v17:CInt64 = IntAnd v12, v14
           v18:CBool = IsBitEqual v17, v16
           IfTrue v18, bb5()
-          v22:CUInt64[18446744069414584351] = Const CUInt64(18446744069414584351)
+          v22:CUInt64[0xffffffff0000001f] = Const CUInt64(0xffffffff0000001f)
           v23:CPtr[CPtr(0x1008)] = Const CPtr(0x1010)
           v24 = RefineType v23, CUInt64
           v25:CInt64 = IntAnd v12, v22
@@ -7866,13 +7866,13 @@ mod hir_opt_tests {
           PatchPoint SingleRactorMode
           v11:HeapBasicObject = GuardType v6, HeapBasicObject
           v12:CUInt64 = LoadField v11, :_rbasic_flags@0x1000
-          v14:CUInt64[18446744069414584351] = Const CUInt64(18446744069414584351)
+          v14:CUInt64[0xffffffff0000001f] = Const CUInt64(0xffffffff0000001f)
           v15:CPtr[CPtr(0x1008)] = Const CPtr(0x1010)
           v16 = RefineType v15, CUInt64
           v17:CInt64 = IntAnd v12, v14
           v18:CBool = IsBitEqual v17, v16
           IfTrue v18, bb5()
-          v22:CUInt64[18446744069414584351] = Const CUInt64(18446744069414584351)
+          v22:CUInt64[0xffffffff0000001f] = Const CUInt64(0xffffffff0000001f)
           v23:CPtr[CPtr(0x1008)] = Const CPtr(0x1010)
           v24 = RefineType v23, CUInt64
           v25:CInt64 = IntAnd v12, v22

zjit/src/hir_type/mod.rs

@@ -99,7 +99,14 @@ fn write_spec(f: &mut std::fmt::Formatter, printer: &TypePrinter) -> std::fmt::R
         Specialization::Int(val) if ty.is_subtype(types::CUInt8) => write!(f, "[{}]", val & u8::MAX as u64),
         Specialization::Int(val) if ty.is_subtype(types::CUInt16) => write!(f, "[{}]", val & u16::MAX as u64),
         Specialization::Int(val) if ty.is_subtype(types::CUInt32) => write!(f, "[{}]", val & u32::MAX as u64),
-        Specialization::Int(val) if ty.is_subtype(types::CUInt64) => write!(f, "[{val}]"),
+        Specialization::Int(val) if ty.is_subtype(types::CUInt64) => {
+            // Print in hex if signed bit is set
+            if 0 != val & (1 << (u64::BITS - 1)) {
+                write!(f, "[0x{val:x}]")
+            } else {
+                write!(f, "[{val}]")
+            }
+        }
         Specialization::Int(val) if ty.is_subtype(types::CPtr) => write!(f, "[{}]", Const::CPtr(val as *const u8).print(printer.ptr_map)),
         Specialization::Int(val) => write!(f, "[{val}]"),
         Specialization::Double(val) => write!(f, "[{val}]"),
@@ -881,7 +888,7 @@ mod tests {
         assert_eq!(format!("{}", Type::from_cint(types::CInt32, -1)), "CInt32[-1]");
         assert_eq!(format!("{}", Type::from_cint(types::CUInt32, -1)), "CUInt32[4294967295]");
         assert_eq!(format!("{}", Type::from_cint(types::CInt64, -1)), "CInt64[-1]");
-        assert_eq!(format!("{}", Type::from_cint(types::CUInt64, -1)), "CUInt64[18446744073709551615]");
+        assert_eq!(format!("{}", Type::from_cint(types::CUInt64, -1)), "CUInt64[0xffffffffffffffff]");
         assert_eq!(format!("{}", Type::from_cbool(true)), "CBool[true]");
         assert_eq!(format!("{}", Type::from_cbool(false)), "CBool[false]");
         assert_eq!(format!("{}", types::Fixnum), "Fixnum");