From f572038a1cc257af168591ee9e2221371253cc42 Mon Sep 17 00:00:00 2001
From: Haled Odat <8566042+HalidOdat@users.noreply.github.com>
Date: Thu, 15 Jun 2023 19:18:50 +0200
Subject: [PATCH] Merge Terminator Jump types

---
 .../src/optimizer/control_flow_graph.rs       | 34 +++++++++++--------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/boa_engine/src/optimizer/control_flow_graph.rs b/boa_engine/src/optimizer/control_flow_graph.rs
index a5108383b93..e79c2b4c519 100644
--- a/boa_engine/src/optimizer/control_flow_graph.rs
+++ b/boa_engine/src/optimizer/control_flow_graph.rs
@@ -445,17 +445,14 @@ pub enum Terminator {
     /// TODO: doc
     None,
     /// TODO: doc
-    JumpUnconditional(u32),
-    /// TODO: doc
-    JumpConditional(Opcode, u32),
+    Jump(Opcode, u32),
 }
 
 impl Debug for Terminator {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
             Terminator::None => write!(f, "None"),
-            Terminator::JumpUnconditional(target) => write!(f, "Jump B{target}"),
-            Terminator::JumpConditional(opcode, target) => {
+            Terminator::Jump(opcode, target) => {
                 write!(f, "{} B{target}", opcode.as_str())
             }
         }
@@ -467,6 +464,21 @@ impl Terminator {
     pub fn is_none(&self) -> bool {
         matches!(self, Terminator::None)
     }
+
+    /// Check if [`Terminator::Jump`].
+    pub fn is_jump(&self) -> bool {
+        matches!(self, Terminator::Jump(_, _))
+    }
+
+    /// Check if unconditional [`Terminator::Jump`].
+    pub fn is_unconditional_jump(&self) -> bool {
+        matches!(self, Terminator::Jump(Opcode::Jump, _))
+    }
+
+    /// Check if conditional [`Terminator::Jump`].
+    pub fn is_conditional_jump(&self) -> bool {
+        matches!(self, Terminator::Jump(opcode, _) if *opcode != Opcode::Jump)
+    }
 }
 
 /// TODO: doc
@@ -633,7 +645,7 @@ impl ControlFlowGraph {
                     basic_block.terminator = if result.opcode == Opcode::Jump {
                         references[*index as usize].push(i as u32);
 
-                        Terminator::JumpUnconditional(*index)
+                        Terminator::Jump(Opcode::Jump, *index)
                     } else {
                         references[*index as usize].push(i as u32);
 
@@ -641,7 +653,7 @@ impl ControlFlowGraph {
                             references[*index as usize].push(i as u32 + 1);
                         }
 
-                        Terminator::JumpConditional(result.opcode, *index)
+                        Terminator::Jump(result.opcode, *index)
                     };
 
                     basic_block.bytecode.truncate(len - 5);
@@ -712,13 +724,7 @@ impl ControlFlowGraph {
             results.extend(basic_block.bytecode);
             match basic_block.terminator {
                 Terminator::None => {}
-                Terminator::JumpUnconditional(target) => {
-                    results.extend_from_slice(&[Opcode::Jump as u8]);
-                    let start = results.len();
-                    results.extend_from_slice(&[0, 0, 0, 0]);
-                    labels.push((start as u32, target));
-                }
-                Terminator::JumpConditional(opcode, target) => {
+                Terminator::Jump(opcode, target) => {
                     results.extend_from_slice(&[opcode as u8]);
                     let start = results.len();
                     results.extend_from_slice(&[0, 0, 0, 0]);