Remove struct RData code from ZJIT

Author: nobu

zjit/src/codegen.rs

@@ -2566,25 +2566,6 @@ fn gen_guard_type(jit: &mut JITState, asm: &mut Assembler, val: lir::Opnd, guard
 
         asm.cmp(klass, Opnd::Value(expected_class));
         asm.jne(jit, side_exit);
-    } else if guard_type.is_subtype(types::TypedTData) {
-        let side = side_exit(jit, state, GuardType(guard_type));
-
-        // Check special constant
-        asm.test(val, Opnd::UImm(RUBY_IMMEDIATE_MASK as u64));
-        asm.jnz(jit, side.clone());
-
-        // Check false
-        asm.cmp(val, Qfalse.into());
-        asm.je(jit, side.clone());
-
-        // Check the builtin type and RUBY_TYPED_FL_IS_TYPED_DATA with mask and compare
-        let val = asm.load_mem(val);
-        let flags = asm.load(Opnd::mem(VALUE_BITS, val, RUBY_OFFSET_RBASIC_FLAGS));
-        let mask     = RUBY_T_MASK.to_usize() | RUBY_TYPED_FL_IS_TYPED_DATA.to_usize();
-        let expected = RUBY_T_DATA.to_usize() | RUBY_TYPED_FL_IS_TYPED_DATA.to_usize();
-        let masked = asm.and(flags, mask.into());
-        asm.cmp(masked, expected.into());
-        asm.jne(jit, side);
     } else if let Some(builtin_type) = guard_type.builtin_type_equivalent() {
         let side = side_exit(jit, state, GuardType(guard_type));
 

zjit/src/cruby.rs

@@ -607,8 +607,7 @@ impl VALUE {
     /// Typed `T_DATA` made from `TypedData_Make_Struct()` (e.g. Thread, ARGF)
     pub fn typed_data_p(self) -> bool {
         !self.special_const_p() &&
-            self.builtin_type() == RUBY_T_DATA &&
-            0 != (self.builtin_flags() & RUBY_TYPED_FL_IS_TYPED_DATA.to_usize())
+            self.builtin_type() == RUBY_T_DATA
     }
 
     pub fn typed_data_fields_embedded_p(self) -> bool {

zjit/src/cruby_bindings.inc.rs

@@ -450,6 +450,8 @@ impl Type {
             Some(cruby::RUBY_T_STRING)
         } else if self.bit_equal(types::Hash) {
             Some(cruby::RUBY_T_HASH)
+        } else if self.is_subtype(types::TypedTData) {
+            Some(cruby::RUBY_T_DATA)
         } else {
             // Note that types::TypedTData is narrower than T_DATA, so not here.
             None

zjit/src/hir_type/mod.rs

@@ -357,7 +357,7 @@ impl ProfiledType {
         } else if self.flags().is_t_module() {
             (RUBY_T_MODULE, RUBY_T_MASK)
         } else if self.flags().is_typed_data() {
-            (RUBY_T_DATA | RUBY_TYPED_FL_IS_TYPED_DATA, RUBY_T_MASK | RUBY_TYPED_FL_IS_TYPED_DATA)
+            (RUBY_T_DATA, RUBY_T_MASK)
         } else {
             (0, 0)
         };