From cd8d20cd1fbcf9bf9d438b306beb65b2417fcc04 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Tue, 8 Aug 2023 16:06:22 -0700 Subject: YJIT: Compile exception handlers (#8171) Co-authored-by: Maxime Chevalier-Boisvert --- lib/ruby_vm/rjit/compiler.rb | 6 +++--- lib/ruby_vm/rjit/invariants.rb | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'lib/ruby_vm') diff --git a/lib/ruby_vm/rjit/compiler.rb b/lib/ruby_vm/rjit/compiler.rb index 1c024c4c40..9ae528a0e9 100644 --- a/lib/ruby_vm/rjit/compiler.rb +++ b/lib/ruby_vm/rjit/compiler.rb @@ -64,7 +64,7 @@ module RubyVM::RJIT asm = Assembler.new compile_prologue(asm, iseq, pc) compile_block(asm, jit:, pc:) - iseq.body.jit_func = @cb.write(asm) + iseq.body.jit_entry = @cb.write(asm) rescue Exception => e $stderr.puts e.full_message exit 1 @@ -176,8 +176,8 @@ module RubyVM::RJIT # If they were the ISEQ's first blocks, re-compile RJIT entry as well if iseq.body.iseq_encoded.to_i == pc - iseq.body.jit_func = 0 - iseq.body.total_calls = 0 + iseq.body.jit_entry = 0 + iseq.body.jit_entry_calls = 0 end end diff --git a/lib/ruby_vm/rjit/invariants.rb b/lib/ruby_vm/rjit/invariants.rb index db1068b5c2..5b061d1994 100644 --- a/lib/ruby_vm/rjit/invariants.rb +++ b/lib/ruby_vm/rjit/invariants.rb @@ -143,11 +143,11 @@ module RubyVM::RJIT C.rjit_for_each_iseq do |iseq| # Avoid entering past code - iseq.body.jit_func = 0 + iseq.body.jit_entry = 0 # Avoid reusing past code iseq.body.rjit_blocks.clear if iseq.body.rjit_blocks # Compile this again if not converted to trace_* insns - iseq.body.total_calls = 0 + iseq.body.jit_entry_calls = 0 end end end -- cgit v1.2.3