4 files changed, 87 insertions, 99 deletions
@@ -617,7 +617,7 @@ fn write_rm_multi(cb: &mut CodeBlock, op_mem_reg8: u8, op_mem_reg_pref: u8, op_r
 write_rm(cb, sz_pref, rex_w, X86Opnd::None, opnd0, op_ext_imm, &[op_mem_imm_lrg]);
 cb.write_int(uimm.value, if opnd_size > 32 { 32 } else { opnd_size.into() });
 } else {
- panic!("immediate value too large (num_bits={})", num_bits);
 }
 },
 _ => unreachable!()
@@ -1938,9 +1938,11 @@ fn gen_set_ivar(
 let val_opnd = ctx.stack_pop(1);
 let recv_opnd = ctx.stack_pop(1);
- // Call rb_vm_set_ivar_id with the receiver, the ivar name, and the value
 let val = asm.ccall(
- rb_vm_set_ivar_id as *const u8,
 vec![
 recv_opnd,
 Opnd::UImm(ivar_name),
@@ -2021,82 +2023,81 @@ fn gen_get_ivar(
 return EndBlock;
 }
- let ivar_index = unsafe {
- let shape_id = comptime_receiver.shape_of();
- let shape = rb_shape_get_shape_by_id(shape_id);
- let mut ivar_index: u32 = 0;
- if rb_shape_get_iv_index(shape, ivar_name, &mut ivar_index) {
- Some(ivar_index as usize)
- } else {
- None
- }
- };
-
- // must be before stack_pop
- let recv_type = ctx.get_opnd_type(recv_opnd);
-
- // Upgrade type
- if !recv_type.is_heap() {
- ctx.upgrade_opnd_type(recv_opnd, Type::UnknownHeap);
- }
 // Pop receiver if it's on the temp stack
 if recv_opnd != SelfOpnd {
 ctx.stack_pop(1);
 }
- // Guard heap object
- if !recv_type.is_heap() {
- guard_object_is_heap(asm, recv, side_exit);
 }
 // Compile time self is embedded and the ivar index lands within the object
- let embed_test_result = unsafe { FL_TEST_RAW(comptime_receiver, VALUE(ROBJECT_EMBED.as_usize())) != VALUE(0) };
-
- let flags_mask: usize = unsafe { rb_shape_flags_mask() }.as_usize();
- let expected_flags_mask: usize = (RUBY_T_MASK as usize) | !flags_mask | (ROBJECT_EMBED as usize);
- let expected_flags = comptime_receiver.builtin_flags() & expected_flags_mask;
-
- // Combined guard for all flags: shape, embeddedness, and T_OBJECT
- let flags_opnd = Opnd::mem(64, recv, RUBY_OFFSET_RBASIC_FLAGS);
-
- asm.comment("guard shape, embedded, and T_OBJECT");
- let flags_opnd = asm.and(flags_opnd, Opnd::UImm(expected_flags_mask as u64));
- asm.cmp(flags_opnd, Opnd::UImm(expected_flags as u64));
- jit_chain_guard(
- JCC_JNE,
- jit,
- &starting_context,
- asm,
- ocb,
- max_chain_depth,
- side_exit,
- );
-
- // If there is no IVAR index, then the ivar was undefined
- // when we entered the compiler. That means we can just return
- // nil for this shape + iv name
- if ivar_index.is_none() {
- let out_opnd = ctx.stack_push(Type::Nil);
- asm.mov(out_opnd, Qnil.into());
- } else if embed_test_result {
 // See ROBJECT_IVPTR() from include/ruby/internal/core/robject.h
 // Load the variable
- let offs = ROBJECT_OFFSET_AS_ARY + (ivar_index.unwrap() * SIZEOF_VALUE) as i32;
 let ivar_opnd = Opnd::mem(64, recv, offs);
 // Push the ivar on the stack
 let out_opnd = ctx.stack_push(Type::Unknown);
- asm.mov(out_opnd, ivar_opnd);
 } else {
 // Compile time value is *not* embedded.
 if USE_RVARGC == 0 {
 // Check that the extended table is big enough
 // Check that the slot is inside the extended table (num_slots > index)
 let num_slots = Opnd::mem(32, recv, ROBJECT_OFFSET_NUMIV);
- asm.cmp(num_slots, Opnd::UImm(ivar_index.unwrap() as u64));
 asm.jbe(counted_exit!(ocb, side_exit, getivar_idx_out_of_range).into());
 }
@@ -2104,10 +2105,15 @@ fn gen_get_ivar(
 let tbl_opnd = asm.load(Opnd::mem(64, recv, ROBJECT_OFFSET_AS_HEAP_IVPTR));
 // Read the ivar from the extended table
- let ivar_opnd = Opnd::mem(64, tbl_opnd, (SIZEOF_VALUE * ivar_index.unwrap()) as i32);
 let out_opnd = ctx.stack_push(Type::Unknown);
- asm.mov(out_opnd, ivar_opnd);
 }
 // Jump to next instruction. This allows guard chains to share the same successor.
@@ -2130,12 +2136,25 @@ fn gen_getinstancevariable(
 let ivar_name = jit_get_arg(jit, 0).as_u64();
 let comptime_val = jit_peek_at_self(jit);
 // Generate a side exit
 let side_exit = get_side_exit(jit, ocb, ctx);
 // Guard that the receiver has the same class as the one from compile time.
 let self_asm_opnd = Opnd::mem(64, CFP, RUBY_OFFSET_CFP_SELF);
 gen_get_ivar(
 jit,
@@ -120,7 +120,7 @@ extern "C" {
 obj: VALUE,
 v: VALUE,
 ) -> bool;
- pub fn rb_vm_set_ivar_id(obj: VALUE, idx: u32, val: VALUE) -> VALUE;
 pub fn rb_vm_setinstancevariable(iseq: IseqPtr, obj: VALUE, id: ID, val: VALUE, ic: IVC);
 pub fn rb_aliased_callable_method_entry(
 me: *const rb_callable_method_entry_t,
@@ -354,26 +354,18 @@ impl VALUE {
 /// Read the flags bits from the RBasic object, then return a Ruby type enum (e.g. RUBY_T_ARRAY)
 pub fn builtin_type(self) -> ruby_value_type {
- (self.builtin_flags() & (RUBY_T_MASK as usize)) as ruby_value_type
- }
-
- pub fn builtin_flags(self) -> usize {
 assert!(!self.special_const_p());
 let VALUE(cval) = self;
 let rbasic_ptr = cval as *const RBasic;
 let flags_bits: usize = unsafe { (*rbasic_ptr).flags }.as_usize();
- return flags_bits;
 }
 pub fn class_of(self) -> VALUE {
 unsafe { CLASS_OF(self) }
 }
- pub fn shape_of(self) -> u32 {
- unsafe { rb_shape_get_shape_id(self) }
- }
-
 pub fn as_isize(self) -> isize {
 let VALUE(is) = self;
 is as isize
@@ -269,29 +269,6 @@ extern "C" {
 extern "C" {
 pub fn rb_reg_new_ary(ary: VALUE, options: ::std::os::raw::c_int) -> VALUE;
 }
-pub type attr_index_t = u32;
-pub type shape_id_t = u32;
-#[repr(C)]
-pub struct rb_shape {
- pub parent: *mut rb_shape,
- pub edges: *mut rb_id_table,
- pub edge_name: ID,
- pub iv_count: attr_index_t,
- pub type_: u8,
-}
-pub type rb_shape_t = rb_shape;
-extern "C" {
- pub fn rb_shape_get_shape_by_id(shape_id: shape_id_t) -> *mut rb_shape_t;
-}
-extern "C" {
- pub fn rb_shape_get_shape_id(obj: VALUE) -> shape_id_t;
-}
-extern "C" {
- pub fn rb_shape_get_iv_index(shape: *mut rb_shape_t, id: ID, value: *mut attr_index_t) -> bool;
-}
-extern "C" {
- pub fn rb_shape_flags_mask() -> VALUE;
-}
 pub const idDot2: ruby_method_ids = 128;
 pub const idDot3: ruby_method_ids = 129;
 pub const idUPlus: ruby_method_ids = 132;
@@ -595,11 +572,6 @@ pub const OPTIMIZED_METHOD_TYPE_STRUCT_AREF: method_optimized_type = 3;
 pub const OPTIMIZED_METHOD_TYPE_STRUCT_ASET: method_optimized_type = 4;
 pub const OPTIMIZED_METHOD_TYPE__MAX: method_optimized_type = 5;
 pub type method_optimized_type = u32;
-#[repr(C)]
-#[derive(Debug, Copy, Clone)]
-pub struct rb_id_table {
- _unused: [u8; 0],
-}
 extern "C" {
 pub fn rb_method_entry_at(obj: VALUE, id: ID) -> *const rb_method_entry_t;
 }
@@ -628,10 +600,9 @@ pub struct iseq_inline_constant_cache {
 pub segments: *const ID,
 }
 #[repr(C)]
 pub struct iseq_inline_iv_cache_entry {
- pub source_shape_id: shape_id_t,
- pub dest_shape_id: shape_id_t,
- pub attr_index: attr_index_t,
 }
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
@@ -727,6 +698,12 @@ extern "C" {
 ) -> *const rb_callable_method_entry_t;
 }
 #[repr(C)]
 pub struct rb_cvar_class_tbl_entry {
 pub index: u32,
 pub global_cvar_state: rb_serial_t,