Merge pull request #331 from Pat-Lafon/main

brilirs: error on duplicate labels
sampsyo · Jul 27, 2024 · 5416bb7 · 5416bb7
2 parents f3fc3a6 + 1158ba5
commit 5416bb7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 26 deletions.
diff --git a/brilirs/src/basic_block.rs b/brilirs/src/basic_block.rs
@@ -210,43 +210,28 @@ impl BBFunction {
     let mut curr_block = BasicBlock::new();
     for instr in func.instrs {
       match instr {
-        bril_rs::Code::Label { label, pos: _ } => {
+        bril_rs::Code::Label { label, pos } => {
           if !curr_block.instrs.is_empty() || curr_block.label.is_some() {
-            if let Some(old_label) = curr_block.label.as_ref() {
-              label_map.insert(old_label.to_string(), blocks.len());
-            }
             blocks.push(curr_block);
             curr_block = BasicBlock::new();
           }
+          if label_map.insert(label.to_string(), blocks.len()).is_some() {
+            return Err(InterpError::DuplicateLabel(label).add_pos(pos));
+          }
           curr_block.label = Some(label);
         }
-        bril_rs::Code::Instruction(bril_rs::Instruction::Effect {
-          op,
-          args,
-          funcs,
-          labels,
-          pos,
-        }) if op == bril_rs::EffectOps::Jump
-          || op == bril_rs::EffectOps::Branch
-          || op == bril_rs::EffectOps::Return =>
+        bril_rs::Code::Instruction(i @ bril_rs::Instruction::Effect { op, .. })
+          if op == bril_rs::EffectOps::Jump
+            || op == bril_rs::EffectOps::Branch
+            || op == bril_rs::EffectOps::Return =>
         {
-          let i = bril_rs::Instruction::Effect {
-            op,
-            args,
-            funcs,
-            labels,
-            pos,
-          };
           curr_block.numified_instrs.push(NumifiedInstruction::new(
             &i,
             &mut num_of_vars,
             &mut num_var_map,
             func_map,
           )?);
           curr_block.instrs.push(i);
-          if let Some(l) = curr_block.label.as_ref() {
-            label_map.insert(l.to_string(), blocks.len());
-          }
           blocks.push(curr_block);
           curr_block = BasicBlock::new();
         }
@@ -263,9 +248,6 @@ impl BBFunction {
     }
 
     if !curr_block.instrs.is_empty() || curr_block.label.is_some() {
-      if let Some(l) = curr_block.label.as_ref() {
-        label_map.insert(l.to_string(), blocks.len());
-      }
       blocks.push(curr_block);
     }
 

diff --git a/brilirs/src/error.rs b/brilirs/src/error.rs
@@ -25,6 +25,8 @@ pub enum InterpError {
   NotOneChar,
   #[error("multiple functions of the same name found")]
   DuplicateFunction,
+  #[error("duplicate label `{0}` found")]
+  DuplicateLabel(String),
   #[error("Expected empty return for `{0}`, found value")]
   NonEmptyRetForFunc(String),
   #[error("cannot allocate `{0}` entries")]