simple rescue+while+break should not use `throw`

609de71f04 fixes the issue by using
`throw` insn if `ensure` is used. However, that patch introduce
additional `throw` even if it is not needed. This patch solves
the issue.

This issue is pointed by @mame.
This commit is contained in:
Koichi Sasada 2021-05-18 17:11:39 +09:00
Родитель 59b327aa58
Коммит 817764bd82
2 изменённых файлов: 18 добавлений и 5 удалений

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

@ -5409,12 +5409,14 @@ add_ensure_range(rb_iseq_t *iseq, struct ensure_range *erange,
static bool
can_add_ensure_iseq(const rb_iseq_t *iseq)
{
if (ISEQ_COMPILE_DATA(iseq)->in_rescue && ISEQ_COMPILE_DATA(iseq)->ensure_node_stack) {
return false;
}
else {
return true;
struct iseq_compile_data_ensure_node_stack *e;
if (ISEQ_COMPILE_DATA(iseq)->in_rescue && (e = ISEQ_COMPILE_DATA(iseq)->ensure_node_stack) != NULL) {
while (e) {
if (e->ensure_node) return false;
e = e->prev;
}
}
return true;
}
static void

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

@ -104,6 +104,17 @@ class TestException < Test::Unit::TestCase
end
end
end
iseq = RubyVM::InstructionSequence.compile(<<-RUBY)
begin
while true
break
end
rescue
end
RUBY
assert_equal false, iseq.to_a[13].any?{|(e,_)| e == :throw}
end
def test_exception_in_ensure_with_redo