diff options
author | John Hawthorn <john@hawthorn.email> | 2021-09-14 08:58:05 -0700 |
---|---|---|
committer | Alan Wu <XrXr@users.noreply.github.com> | 2021-10-20 18:19:40 -0400 |
commit | 7d99e8560135ffb1ddb96368b2eac4a9b5d9964d (patch) | |
tree | d9d5c0a99526411c72a05fdbc5f1dc0b9cc6ba5d | |
parent | f1b7568f5ad6f001d848bbe5677b9ff340d58c90 (diff) | |
download | ruby-7d99e8560135ffb1ddb96368b2eac4a9b5d9964d.tar.gz |
Check for comptime fixnum in gen_fixnum_cmp
-rw-r--r-- | yjit_codegen.c | 55 |
1 files changed, 34 insertions, 21 deletions
diff --git a/yjit_codegen.c b/yjit_codegen.c index 1da17392c0..e9f6e996f9 100644 --- a/yjit_codegen.c +++ b/yjit_codegen.c @@ -1880,33 +1880,46 @@ typedef void (*cmov_fn)(codeblock_t* cb, x86opnd_t opnd0, x86opnd_t opnd1); static codegen_status_t gen_fixnum_cmp(jitstate_t* jit, ctx_t* ctx, cmov_fn cmov_op) { - // Create a size-exit to fall back to the interpreter - // Note: we generate the side-exit before popping operands from the stack - uint8_t* side_exit = yjit_side_exit(jit, ctx); - - if (!assume_bop_not_redefined(jit->block, INTEGER_REDEFINED_OP_FLAG, BOP_LT)) { - return YJIT_CANT_COMPILE; + // Defer compilation so we can specialize base on a runtime receiver + if (!jit_at_current_insn(jit)) { + defer_compilation(jit->block, jit->insn_idx, ctx); + return YJIT_END_BLOCK; } - // Check that both operands are fixnums - guard_two_fixnums(ctx, side_exit); + VALUE comptime_a = jit_peek_at_stack(jit, ctx, 1); + VALUE comptime_b = jit_peek_at_stack(jit, ctx, 0); - // Get the operands from the stack - x86opnd_t arg1 = ctx_stack_pop(ctx, 1); - x86opnd_t arg0 = ctx_stack_pop(ctx, 1); + if (FIXNUM_P(comptime_a) && FIXNUM_P(comptime_b)) { + // Create a size-exit to fall back to the interpreter + // Note: we generate the side-exit before popping operands from the stack + uint8_t* side_exit = yjit_side_exit(jit, ctx); - // Compare the arguments - xor(cb, REG0_32, REG0_32); // REG0 = Qfalse - mov(cb, REG1, arg0); - cmp(cb, REG1, arg1); - mov(cb, REG1, imm_opnd(Qtrue)); - cmov_op(cb, REG0, REG1); + if (!assume_bop_not_redefined(jit->block, INTEGER_REDEFINED_OP_FLAG, BOP_LT)) { + return YJIT_CANT_COMPILE; + } - // Push the output on the stack - x86opnd_t dst = ctx_stack_push(ctx, TYPE_UNKNOWN); - mov(cb, dst, REG0); + // Check that both operands are fixnums + guard_two_fixnums(ctx, side_exit); - return YJIT_KEEP_COMPILING; + // Get the operands from the stack + x86opnd_t arg1 = ctx_stack_pop(ctx, 1); + x86opnd_t arg0 = ctx_stack_pop(ctx, 1); + + // Compare the arguments + xor(cb, REG0_32, REG0_32); // REG0 = Qfalse + mov(cb, REG1, arg0); + cmp(cb, REG1, arg1); + mov(cb, REG1, imm_opnd(Qtrue)); + cmov_op(cb, REG0, REG1); + + // Push the output on the stack + x86opnd_t dst = ctx_stack_push(ctx, TYPE_UNKNOWN); + mov(cb, dst, REG0); + + return YJIT_KEEP_COMPILING; + } else { + return gen_opt_send_without_block(jit, ctx); + } } static codegen_status_t |