diff options
| -rw-r--r-- | lib/ruby_vm/rjit/insn_compiler.rb | 9 | ||||
| -rw-r--r-- | tool/lib/core_assertions.rb | 7 |
2 files changed, 6 insertions, 10 deletions
diff --git a/lib/ruby_vm/rjit/insn_compiler.rb b/lib/ruby_vm/rjit/insn_compiler.rb index be497bc9a1..b486b5b3d4 100644 --- a/lib/ruby_vm/rjit/insn_compiler.rb +++ b/lib/ruby_vm/rjit/insn_compiler.rb @@ -1366,7 +1366,7 @@ module RubyVM::RJIT # calling->ci mid = C.vm_ci_mid(cd.ci) - calling = build_calling(ci: cd.ci, block_handler:) + calling = build_calling(ci: cd.ci, block_handler: blockiseq) # vm_sendish cme, comptime_recv_klass = jit_search_method(jit, ctx, asm, mid, calling) @@ -3941,13 +3941,6 @@ module RubyVM::RJIT return blockiseq else if is_super - # GET_BLOCK_HANDLER(); - # Guard no block passed. Only handle that case for now. - asm.comment('guard no block given') - jit_get_lep(jit, asm, reg: :rax) - asm.cmp([:rax, C.VALUE.size * C::VM_ENV_DATA_INDEX_SPECVAL], C::VM_BLOCK_HANDLER_NONE) - asm.jne(counted_exit(side_exit, :send_block_handler)) - return C::VM_BLOCK_HANDLER_NONE else # Not implemented yet. Is this even necessary? asm.incr_counter(:send_block_setup) diff --git a/tool/lib/core_assertions.rb b/tool/lib/core_assertions.rb index 1fdc0a34b8..c5b4089862 100644 --- a/tool/lib/core_assertions.rb +++ b/tool/lib/core_assertions.rb @@ -744,13 +744,16 @@ eom # # :yield: each elements of +seq+. def assert_linear_performance(seq, rehearsal: nil, pre: ->(n) {n}) + # Timeout testing generally doesn't work when RJIT compilation happens. + rjit_enabled = defined?(RubyVM::RJIT) && RubyVM::RJIT.enabled? + first = seq.first *arg = pre.call(first) times = (0..(rehearsal || (2 * first))).map do st = Process.clock_gettime(Process::CLOCK_MONOTONIC) yield(*arg) t = (Process.clock_gettime(Process::CLOCK_MONOTONIC) - st) - assert_operator 0, :<=, t + assert_operator 0, :<=, t unless rjit_enabled t.nonzero? end times.compact! @@ -766,7 +769,7 @@ eom Timeout.timeout(t, Timeout::Error, message) do st = Process.clock_gettime(Process::CLOCK_MONOTONIC) yield(*arg) - assert_operator (Process.clock_gettime(Process::CLOCK_MONOTONIC) - st), :<=, t, message + assert_operator (Process.clock_gettime(Process::CLOCK_MONOTONIC) - st), :<=, t, message unless rjit_enabled end end end |