kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Check for ::Array, not T_ARRAY in opt_aref

Browse source
This commit is contained in:
Alan Wu 2021-02-19 11:20:55 -05:00
parent 9d62ab303c
commit 064e345053
2 changed files with 24 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
bootstraptest/test_ujit.rb
View file

@ -197,3 +197,20 @@ assert_equal "nil\n", %q{
p other.read p other.read
} }
# Test that opt_aref checks the class of the receiver
assert_equal ":special\n", %q{
def foo(array)
array[30]
end
UJIT.install_entry(RubyVM::InstructionSequence.of(method(:foo)))
special = []
def special.[](idx)
:special
end
p foo(special)
nil
}

13
ujit_codegen.c
View file

@ -717,7 +717,7 @@ gen_opt_aref(jitstate_t* jit, ctx_t* ctx)
uint8_t* side_exit = ujit_side_exit(jit, ctx); uint8_t* side_exit = ujit_side_exit(jit, ctx);
// TODO: make a helper function for guarding on op-not-redefined // TODO: make a helper function for guarding on op-not-redefined
// Make sure that minus isn't redefined for integers // Make sure that aref isn't redefined for arrays.
mov(cb, RAX, const_ptr_opnd(ruby_current_vm_ptr)); mov(cb, RAX, const_ptr_opnd(ruby_current_vm_ptr));
test( test(
cb, cb,
@ -740,10 +740,11 @@ gen_opt_aref(jitstate_t* jit, ctx_t* ctx)
cmp(cb, REG0, imm_opnd(Qnil)); cmp(cb, REG0, imm_opnd(Qnil));
je_ptr(cb, side_exit); je_ptr(cb, side_exit);
// Bail if recv is not an array // Bail if recv has a class other than ::Array.
mov(cb, REG1, mem_opnd(64, REG0, offsetof(struct RBasic, flags))); // BOP_AREF check above is only good for ::Array.
and(cb, REG1, imm_opnd(T_MASK)); mov(cb, REG1, mem_opnd(64, REG0, offsetof(struct RBasic, klass)));
cmp(cb, REG1, imm_opnd(T_ARRAY)); mov(cb, REG0, const_ptr_opnd((void *)rb_cArray));
cmp(cb, REG0, REG1);
jne_ptr(cb, side_exit); jne_ptr(cb, side_exit);
// Bail if idx is not a FIXNUM // Bail if idx is not a FIXNUM
@ -758,7 +759,7 @@ gen_opt_aref(jitstate_t* jit, ctx_t* ctx)
// Maintain 16-byte RSP alignment // Maintain 16-byte RSP alignment
sub(cb, RSP, imm_opnd(8)); sub(cb, RSP, imm_opnd(8));
mov(cb, RDI, REG0); mov(cb, RDI, recv_opnd);
sar(cb, REG1, imm_opnd(1)); // Convert fixnum to int sar(cb, REG1, imm_opnd(1)); // Convert fixnum to int
mov(cb, RSI, REG1); mov(cb, RSI, REG1);
call_ptr(cb, REG0, (void *)rb_ary_entry_internal); call_ptr(cb, REG0, (void *)rb_ary_entry_internal);