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

Use push and pop in jit_rb_obj_not to avoid corrupting types

Browse source
This commit is contained in:
John Hawthorn 2021-07-12 12:33:24 -07:00 • committed by Alan Wu
parent 0c390e9965
commit dc8aca1883
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
yjit_codegen.c
View file

@ -2409,18 +2409,19 @@ static bool
jit_rb_obj_not(jitstate_t *jit, ctx_t *ctx, const struct rb_callinfo *ci, const rb_callable_method_entry_t *cme, rb_iseq_t *block, const int32_t argc) jit_rb_obj_not(jitstate_t *jit, ctx_t *ctx, const struct rb_callinfo *ci, const rb_callable_method_entry_t *cme, rb_iseq_t *block, const int32_t argc)
{ {
const val_type_t recv_opnd = ctx_get_opnd_type(ctx, OPND_STACK(0)); const val_type_t recv_opnd = ctx_get_opnd_type(ctx, OPND_STACK(0));
x86opnd_t out_opnd = ctx_stack_opnd(ctx, 0);
if (recv_opnd.type == ETYPE_NIL || recv_opnd.type == ETYPE_FALSE) { if (recv_opnd.type == ETYPE_NIL || recv_opnd.type == ETYPE_FALSE) {
ADD_COMMENT(cb, "rb_obj_not(nil_or_false)"); ADD_COMMENT(cb, "rb_obj_not(nil_or_false)");
ctx_stack_pop(ctx, 1);
x86opnd_t out_opnd = ctx_stack_push(ctx, TYPE_TRUE);
mov(cb, out_opnd, imm_opnd(Qtrue)); mov(cb, out_opnd, imm_opnd(Qtrue));
ctx_set_opnd_type(ctx, OPND_STACK(0), TYPE_TRUE);
} }
else if (recv_opnd.is_heap || recv_opnd.type != ETYPE_UNKNOWN) { else if (recv_opnd.is_heap || recv_opnd.type != ETYPE_UNKNOWN) {
// Note: recv_opnd.type != ETYPE_NIL && recv_opnd.type != ETYPE_FALSE. // Note: recv_opnd.type != ETYPE_NIL && recv_opnd.type != ETYPE_FALSE.
ADD_COMMENT(cb, "rb_obj_not(truthy)"); ADD_COMMENT(cb, "rb_obj_not(truthy)");
ctx_stack_pop(ctx, 1);
x86opnd_t out_opnd = ctx_stack_push(ctx, TYPE_FALSE);
mov(cb, out_opnd, imm_opnd(Qfalse)); mov(cb, out_opnd, imm_opnd(Qfalse));
ctx_set_opnd_type(ctx, OPND_STACK(0), TYPE_FALSE);
} }
else { else {
// jit_guard_known_klass() already ran on the receiver which should // jit_guard_known_klass() already ran on the receiver which should