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

Fix assertions in invalidate_block_version(), add small repro (#14)

Browse source 
* Fix block invalidation assertions

* Add Alan's small repro for double invalidation bug
This commit is contained in:
Maxime Chevalier-Boisvert 2021-04-27 16:27:56 -04:00 • committed by Alan Wu
parent cfaf601303
commit bce6dea72d
2 changed files with 27 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
bootstraptest/test_yjit.rb
View file

@ -172,6 +172,28 @@ assert_equal '1', %q{
retval
}
# Code invalidation and opt_getinlinecache
assert_normal_exit %q{
class Foo; end
# Uses the class constant Foo
def use_constant(arg)
[Foo.new, arg]
end
def propagate_type
i = Array.new
i.itself # make it remember that i is on-heap
use_constant(i)
end
propagate_type
propagate_type
use_constant(Foo.new)
class Jo; end # bump global constant state
use_constant(3)
}
# Method redefinition (code invalidation) and GC
assert_equal '7', %q{
def bar()

9
yjit_core.c
View file

@ -888,7 +888,11 @@ invalidate_block_version(block_t* block)
{
branch_t* branch = rb_darray_get(block->incoming, incoming_idx);
uint32_t target_idx = (branch->dst_addrs[0] == code_ptr)? 0:1;
RUBY_ASSERT(!branch->blocks[target_idx] || branch->blocks[target_idx] == block);
RUBY_ASSERT(branch->dst_addrs[target_idx] == code_ptr);
RUBY_ASSERT(branch->blocks[target_idx] == block);
// Mark this target as being a stub
branch->blocks[target_idx] = NULL;
// Create a stub for this branch target
branch->dst_addrs[target_idx] = get_branch_target(
@ -898,9 +902,6 @@ invalidate_block_version(block_t* block)
target_idx
);
// Mark this target as being a stub
branch->blocks[target_idx] = NULL;
// Check if the invalidated block immediately follows
bool target_next = block->start_pos == branch->end_pos;