1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make flag clearing better

Browse Source
This commit is contained in:
Aaron Patterson 2022-11-18 13:13:32 -08:00 committed by Takashi Kokubun
parent 07fe3d37c5
commit be40af284a
Notes: git 2022-12-02 20:54:15 +00:00 
Merged: https://github.com/ruby/ruby/pull/6767
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
yjit/src/codegen.rs
View File

@ -2333,13 +2333,14 @@ fn gen_setinstancevariable(
gen_write_iv(asm, comptime_receiver, recv, ivar_index, write_val, needs_extension);
asm.comment("write shape");
let cleared_flags = asm.and(
Opnd::mem(64, recv, RUBY_OFFSET_RBASIC_FLAGS),
Opnd::UImm(unsafe { rb_shape_flag_mask() }.into()));
let new_flags = asm.or(cleared_flags, Opnd::UImm((new_shape_id as u64) << unsafe { rb_shape_flag_shift() }));
let shape_bit_size = unsafe { rb_shape_id_num_bits() }; // either 16 or 32 depending on RUBY_DEBUG
let shape_byte_size = shape_bit_size / 8;
let shape_opnd = Opnd::mem(shape_bit_size, recv, RUBY_OFFSET_RBASIC_FLAGS + (8 - shape_byte_size as i32));
asm.store(Opnd::mem(64, recv, RUBY_OFFSET_RBASIC_FLAGS), new_flags);
// Store the new shape
asm.store(shape_opnd, Opnd::UImm(0 as u64));
asm.store(shape_opnd, Opnd::UImm(new_shape_id as u64));
},
Some(ivar_index) => {