From c4794ed73ad348a61a7cfbe3da0a7eb49ba46eb9 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Tue, 18 Feb 2020 23:16:19 -0800 Subject: Avoid jumping to a wrong destination when the next insn is already compiled by former branches. --- tool/ruby_vm/views/_mjit_compile_insn.erb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'tool') diff --git a/tool/ruby_vm/views/_mjit_compile_insn.erb b/tool/ruby_vm/views/_mjit_compile_insn.erb index b2dea03e38..8f45121615 100644 --- a/tool/ruby_vm/views/_mjit_compile_insn.erb +++ b/tool/ruby_vm/views/_mjit_compile_insn.erb @@ -76,9 +76,14 @@ } fprintf(f, "}\n"); % -% # compiler: If insn has conditional JUMP, the branch which is not targeted by JUMP should be compiled too. +% # compiler: If insn has conditional JUMP, the code should go to the branch not targeted by JUMP next. % if insn.expr.expr =~ /if\s+\([^{}]+\)\s+\{[^{}]+JUMP\([^)]+\);[^{}]+\}/ - compile_insns(f, body, b->stack_size, pos + insn_len(insn), status); + if (ALREADY_COMPILED_P(status, pos + insn_len(insn))) { + fprintf(f, "goto label_%d;\n", pos + insn_len(insn)); + } + else { + compile_insns(f, body, b->stack_size, pos + insn_len(insn), status); + } % end % % # compiler: If insn returns (leave) or does longjmp (throw), the branch should no longer be compiled. TODO: create attr for it? -- cgit v1.2.3