diff options
Diffstat (limited to 'lib/ruby_vm/mjit')
| -rw-r--r-- | lib/ruby_vm/mjit/compiler.rb | 33 | ||||
| -rw-r--r-- | lib/ruby_vm/mjit/invariants.rb | 7 |
2 files changed, 20 insertions, 20 deletions
diff --git a/lib/ruby_vm/mjit/compiler.rb b/lib/ruby_vm/mjit/compiler.rb index 710c3fd23d..79a5da44a2 100644 --- a/lib/ruby_vm/mjit/compiler.rb +++ b/lib/ruby_vm/mjit/compiler.rb @@ -29,21 +29,12 @@ module RubyVM::MJIT # Scratch registers: rax, rcx + # Mark objects in this Array during GC + GC_REFS = [] + class Compiler attr_accessor :write_pos - IseqBlocks = Hash.new do |iseq_pc_ctx, iseq| - iseq_pc_ctx[iseq] = Hash.new do |pc_ctx, pc| - pc_ctx[pc] = {} - end - end - DeadBlocks = [] # invalidated IseqBlocks, but kept for safety - - def self.reset_blocks - DeadBlocks << IseqBlocks.dup - IseqBlocks.clear - end - def self.decode_insn(encoded) INSNS.fetch(C.rb_vm_insn_decode(encoded)) end @@ -268,24 +259,34 @@ module RubyVM::MJIT end def list_blocks(iseq, pc) - IseqBlocks[iseq.to_i][pc].values + mjit_blocks(iseq)[pc].values end # @param [Integer] pc # @param [RubyVM::MJIT::Context] ctx # @return [RubyVM::MJIT::Block,NilClass] def find_block(iseq, pc, ctx) - IseqBlocks[iseq.to_i][pc][ctx] + mjit_blocks(iseq)[pc][ctx] end # @param [RubyVM::MJIT::Block] block def set_block(iseq, block) - IseqBlocks[iseq.to_i][block.pc][block.ctx] = block + mjit_blocks(iseq)[block.pc][block.ctx] = block end # @param [RubyVM::MJIT::Block] block def remove_block(iseq, block) - IseqBlocks[iseq.to_i][block.pc].delete(block.ctx) + mjit_blocks(iseq)[block.pc].delete(block.ctx) + end + + def mjit_blocks(iseq) + unless iseq.body.mjit_blocks + iseq.body.mjit_blocks = Hash.new { |h, k| h[k] = {} } + # For some reason, rb_mjit_iseq_mark didn't protect this Hash + # from being freed. So we rely on GC_REFS to keep the Hash. + GC_REFS << iseq.body.mjit_blocks + end + iseq.body.mjit_blocks end end end diff --git a/lib/ruby_vm/mjit/invariants.rb b/lib/ruby_vm/mjit/invariants.rb index 0e8063c0c6..21f70d00a2 100644 --- a/lib/ruby_vm/mjit/invariants.rb +++ b/lib/ruby_vm/mjit/invariants.rb @@ -112,12 +112,11 @@ module RubyVM::MJIT end @patches.clear - # Avoid reusing past code - Compiler.reset_blocks - C.mjit_for_each_iseq do |iseq| - # Disable entering past code + # Avoid entering past code iseq.body.jit_func = 0 + # Avoid reusing past code + iseq.body.mjit_blocks.clear if iseq.body.mjit_blocks # Compile this again if not converted to trace_* insns iseq.body.total_calls = 0 end |