Check and error on duplicate labels

sampsyo · Jul 26, 2024 · 1158ba5 · 1158ba5
1 parent 3368738
commit 1158ba5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/brilirs/src/basic_block.rs b/brilirs/src/basic_block.rs
@@ -210,12 +210,14 @@ 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() {
             blocks.push(curr_block);
             curr_block = BasicBlock::new();
           }
-          label_map.insert(label.to_string(), blocks.len());
+          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(i @ bril_rs::Instruction::Effect { op, .. })

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")]