Skip to content

Check for ::Array, not T_ARRAY in opt_aref #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 19, 2021
Merged

Check for ::Array, not T_ARRAY in opt_aref #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions bootstraptest/test_ujit.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,3 +197,20 @@ def 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 changes: 7 additions & 6 deletions ujit_codegen.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -717,7 +717,7 @@ gen_opt_aref(jitstate_t* jit, ctx_t* ctx)
uint8_t* side_exit = ujit_side_exit(jit, ctx);

// 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));
test(
cb,
Expand All @@ -740,10 +740,11 @@ gen_opt_aref(jitstate_t* jit, ctx_t* ctx)
cmp(cb, REG0, imm_opnd(Qnil));
je_ptr(cb, side_exit);

// Bail if recv is not an array
mov(cb, REG1, mem_opnd(64, REG0, offsetof(struct RBasic, flags)));
and(cb, REG1, imm_opnd(T_MASK));
cmp(cb, REG1, imm_opnd(T_ARRAY));
// Bail if recv has a class other than ::Array.
// BOP_AREF check above is only good for ::Array.
mov(cb, REG1, mem_opnd(64, REG0, offsetof(struct RBasic, klass)));
mov(cb, REG0, const_ptr_opnd((void *)rb_cArray));
cmp(cb, REG0, REG1);
jne_ptr(cb, side_exit);

// Bail if idx is not a FIXNUM
Expand All @@ -758,7 +759,7 @@ gen_opt_aref(jitstate_t* jit, ctx_t* ctx)
// Maintain 16-byte RSP alignment
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
mov(cb, RSI, REG1);
call_ptr(cb, REG0, (void *)rb_ary_entry_internal);
Expand Down