YJIT: Use starting context for status === CantCompile (#7583)

This commit is contained in:
Jimmy Miller 2023-03-23 13:11:46 -04:00 коммит произвёл GitHub
Родитель ed4dc1c33d
Коммит 8286544dc5
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
2 изменённых файлов: 50 добавлений и 3 удалений

Просмотреть файл

@ -3737,3 +3737,45 @@ assert_normal_exit %q{
) )
foo 1 foo 1
} }
# Regression test for CantCompile not using starting_ctx
assert_normal_exit %q{
class Integer
def ===(other)
false
end
end
def my_func(x)
case x
when 1
1
when 2
2
else
3
end
end
my_func(1)
}
# Regression test for CantCompile not using starting_ctx
assert_equal "ArgumentError", %q{
def literal(*args, &block)
s = ''.dup
args = [1, 2, 3]
literal_append(s, *args, &block)
s
end
def literal_append(sql, v)
[sql.inspect, v.inspect]
end
begin
literal("foo")
rescue ArgumentError
"ArgumentError"
end
}

Просмотреть файл

@ -806,6 +806,10 @@ pub fn gen_single_block(
// For each instruction to compile // For each instruction to compile
// NOTE: could rewrite this loop with a std::iter::Iterator // NOTE: could rewrite this loop with a std::iter::Iterator
while insn_idx < iseq_size { while insn_idx < iseq_size {
// Set the starting_ctx so we can use it for side_exiting
// if status == CantCompile
let starting_ctx = ctx.clone();
// Get the current pc and opcode // Get the current pc and opcode
let pc = unsafe { rb_iseq_pc_at_idx(iseq, insn_idx.into()) }; let pc = unsafe { rb_iseq_pc_at_idx(iseq, insn_idx.into()) };
// try_into() call below is unfortunate. Maybe pick i32 instead of usize for opcodes. // try_into() call below is unfortunate. Maybe pick i32 instead of usize for opcodes.
@ -869,9 +873,10 @@ pub fn gen_single_block(
} }
// TODO: if the codegen function makes changes to ctx and then return YJIT_CANT_COMPILE, // TODO: if the codegen function makes changes to ctx and then return YJIT_CANT_COMPILE,
// the exit this generates would be wrong. We could save a copy of the entry context // the exit this generates would be wrong. There are some changes that are safe to make
// and assert that ctx is the same here. // like popping from the stack (but not writing). We are assuming here that only safe
gen_exit(jit.pc, &ctx, &mut asm); // changes were made and using the starting_ctx.
gen_exit(jit.pc, &starting_ctx, &mut asm);
// If this is the first instruction in the block, then // If this is the first instruction in the block, then
// the entry address is the address for block_entry_exit // the entry address is the address for block_entry_exit