LibJS: Don't try to merge blocks not ending in Jumps

lanmonster · Dec 3, 2022 · 186237a · 186237a
1 parent 192897c
commit 186237a
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/Userland/Libraries/LibJS/Bytecode/Pass/MergeBlocks.cpp b/Userland/Libraries/LibJS/Bytecode/Pass/MergeBlocks.cpp
@@ -30,6 +30,9 @@ void MergeBlocks::perform(PassPipelineExecutable& executable)
  if (executable.exported_blocks->contains(*entry.value.begin()))
  continue;
 
+ if (entry.key->terminator()->type() != Instruction::Type::Jump)
+ continue;
+
  {
  InstructionStreamIterator it { entry.key->instruction_stream() };
  auto& first_instruction = *it;
@@ -95,6 +98,7 @@ void MergeBlocks::perform(PassPipelineExecutable& executable)
  auto it = blocks_to_merge.begin();
  auto const* current_block = *it;
  blocks_to_merge.remove(it);
+
  Vector<BasicBlock const*> successors { current_block };
  for (;;) {
  auto const* last = successors.last();