fix(codegen): fix duplicate labels

Author: Entenwilli

.gitignore

@@ -5,3 +5,4 @@
 tests
 test.l2
 output
+test.l3

src/backend/codegen.rs

@@ -31,7 +31,7 @@ _main:
 
 pub struct CodeGenerator {
     ir_graphs: Vec<IRGraph>,
-    jump_label: HashMap<usize, String>,
+    jump_label: HashMap<(String, BlockIndex), String>,
 }
 
 impl CodeGenerator {
@@ -140,7 +140,10 @@ impl CodeGenerator {
         registers: &Registers,
     ) -> String {
         let mut code = String::new();
-        let block_label = self.jump_label.get(&block_index).unwrap();
+        let block_label = self
+            .jump_label
+            .get(&(ir_graph.name().to_string(), block_index))
+            .unwrap();
         code.push_str(&format!("{}:\n", block_label));
 
         for (node_index, node) in block.get_nodes().iter().enumerate() {
@@ -324,7 +327,10 @@ impl CodeGenerator {
                     node,
                 );
                 let following_block_index = jump_information.get(&node_index).unwrap();
-                let label = self.jump_label.get(following_block_index).unwrap();
+                let label = self
+                    .jump_label
+                    .get(&(ir_graph.name().to_string(), *following_block_index))
+                    .unwrap();
                 code.push_str(&self.generate_phi_moves(
                     block_index,
                     *following_block_index,
@@ -372,7 +378,7 @@ impl CodeGenerator {
                 let following_block_index = jump_information.get(&node_index).unwrap();
                 let jump_label = self
                     .jump_label
-                    .get(following_block_index)
+                    .get(&(ir_graph.name().to_string(), *following_block_index))
                     .expect("Expected jump label for false if");
                 code.push_str(&self.generate_phi_moves(
                     block_index,
@@ -620,7 +626,10 @@ impl CodeGenerator {
         registers: &Registers,
     ) -> Option<String> {
         let mut code = String::new();
-        let jump_label = self.jump_label.get(&jump_target).unwrap();
+        let jump_label = self
+            .jump_label
+            .get(&(ir_graph.name().to_string(), jump_target))
+            .unwrap();
         match comparision {
             Node::Lower(data)
             | Node::LowerEquals(data)
@@ -898,20 +907,24 @@ fn move_stack_variable(register: &Box<dyn Register>) -> String {
     code
 }
 
-fn calculate_jump_label(ir_graphs: &Vec<IRGraph>) -> HashMap<usize, String> {
+fn calculate_jump_label(ir_graphs: &Vec<IRGraph>) -> HashMap<(String, BlockIndex), String> {
     let mut jump_label = HashMap::new();
     for ir_graph in ir_graphs {
         for (block_index, block) in ir_graph.get_blocks().iter().enumerate() {
-            calculate_jump_label_block(block_index, block, &mut jump_label);
+            calculate_jump_label_block(block_index, ir_graph, block, &mut jump_label);
         }
     }
     jump_label
 }
 
 fn calculate_jump_label_block<'a>(
     block_index: BlockIndex,
+    ir_graph: &IRGraph,
     _block: &Block,
-    current: &mut HashMap<usize, String>,
+    current: &mut HashMap<(String, BlockIndex), String>,
 ) {
-    current.insert(block_index, format!("LC{}", block_index));
+    current.insert(
+        (ir_graph.name().to_string(), block_index),
+        format!("LC{}{}", ir_graph.name(), block_index),
+    );
 }

src/ir/ast/mod.rs

@@ -54,9 +54,9 @@ pub trait ToIR {
 }
 
 impl IRConstructor {
-    pub fn new() -> IRConstructor {
+    pub fn new(name: String) -> IRConstructor {
         IRConstructor {
-            graph: IRGraph::new(),
+            graph: IRGraph::new(name),
             current_definitions: HashMap::new(),
             incomplete_phis: HashMap::new(),
             current_side_effect: HashMap::new(),

src/ir/graph.rs

@@ -11,12 +11,14 @@ pub const START_BLOCK: usize = 0;
 pub const END_BLOCK: usize = 1;
 
 pub struct IRGraph {
+    name: String,
     blocks: Vec<Block>,
 }
 
 impl IRGraph {
-    pub fn new() -> IRGraph {
+    pub fn new(name: String) -> IRGraph {
         IRGraph {
+            name,
             blocks: vec![
                 Block::new("start".to_string()),
                 Block::new("end".to_string()),
@@ -69,11 +71,15 @@ impl IRGraph {
     pub fn end_block_mut(&mut self) -> &mut Block {
         self.blocks.get_mut(END_BLOCK).expect("End Block missing!")
     }
+
+    pub fn name(&self) -> &String {
+        &self.name
+    }
 }
 
 impl Default for IRGraph {
     fn default() -> Self {
-        Self::new()
+        Self::new("default".to_string())
     }
 }
 

src/main.rs

@@ -54,7 +54,7 @@ fn main() {
 
     let mut ir_graphs = Vec::new();
     for function in program.functions() {
-        let mut ir_graph = IRConstructor::new();
+        let mut ir_graph = IRConstructor::new(function.name_tree().name().as_string().to_string());
         function.to_ir(&mut ir_graph);
         ir_graphs.push(ir_graph.graph());
     }