Collapse jump to jump

voltrevo · Jul 4, 2023 · d38abb7 · d38abb7
1 parent 063ab36
commit d38abb7
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/valuescript_compiler/src/optimization/simplify_jumps.rs b/valuescript_compiler/src/optimization/simplify_jumps.rs
@@ -67,7 +67,11 @@ fn simplify_jumps_fn(fn_: &mut Function) {
             // Instead of jumping to `end`, just end
             substitutions.insert(i, FnLine::Instruction(Instruction::End));
           }
-          FnLine::Instruction(_) => {} // TODO: Collapse jump to jump
+          FnLine::Instruction(Instruction::Jmp(label_ref)) => {
+            // Instead of jumping to another jump, jump directly to where that one goes
+            substitutions.insert(i, FnLine::Instruction(Instruction::Jmp(label_ref.clone())));
+          }
+          FnLine::Instruction(_) => {}
           FnLine::Label(_) | FnLine::Empty | FnLine::Comment(_) | FnLine::Release(_) => {
             panic!("Jump to non-instruction")
           }