refactor: remove block labels from IR block structure and related tests

Author: Arnaud Riess

crates/herkos/src/codegen/mod.rs

@@ -183,7 +183,6 @@ mod tests {
             locals: vec![],
             blocks: vec![IrBlock {
                 id: BlockId(0),
-                label: "block0".to_string(),
                 instructions: vec![IrInstr::BinOp {
                     dest: VarId(2),
                     op: BinOp::I32Add,
@@ -241,7 +240,6 @@ mod tests {
             locals: vec![],
             blocks: vec![IrBlock {
                 id: BlockId(0),
-                label: "block0".to_string(),
                 instructions: vec![],
                 terminator: IrTerminator::Return { value: None },
             }],
@@ -340,7 +338,6 @@ mod tests {
             locals: vec![],
             blocks: vec![IrBlock {
                 id: BlockId(0),
-                label: "block0".to_string(),
                 instructions: vec![IrInstr::BinOp {
                     dest: VarId(2),
                     op: BinOp::I64Add,
@@ -397,7 +394,6 @@ mod tests {
             locals: vec![],
             blocks: vec![IrBlock {
                 id: BlockId(0),
-                label: "block0".to_string(),
                 instructions: vec![
                     IrInstr::Const {
                         dest: VarId(1),
@@ -459,7 +455,6 @@ mod tests {
             locals: vec![],
             blocks: vec![IrBlock {
                 id: BlockId(0),
-                label: "block0".to_string(),
                 instructions: vec![IrInstr::GlobalGet {
                     dest: VarId(0),
                     index: 0,
@@ -521,7 +516,6 @@ mod tests {
             locals: vec![],
             blocks: vec![IrBlock {
                 id: BlockId(0),
-                label: "block0".to_string(),
                 instructions: vec![IrInstr::Load {
                     dest: VarId(1),
                     ty: WasmType::I32,
@@ -591,7 +585,6 @@ mod tests {
             locals: vec![],
             blocks: vec![IrBlock {
                 id: BlockId(0),
-                label: "block0".to_string(),
                 instructions: vec![IrInstr::GlobalGet {
                     dest: VarId(0),
                     index: 0,

crates/herkos/src/ir/builder/core.rs

@@ -145,7 +145,6 @@ impl IrBuilder {
             // Current block doesn't exist yet, create it
             self.blocks.push(IrBlock {
                 id: self.current_block,
-                label: format!("block_{}", self.current_block.0),
                 instructions: vec![instr],
                 terminator: IrTerminator::Unreachable, // Will be set later
             });
@@ -214,7 +213,6 @@ impl IrBuilder {
         self.current_block = entry;
         self.blocks.push(IrBlock {
             id: entry,
-            label: format!("block_{}", entry.0), // "block_0"
             instructions: Vec::new(),
             terminator: IrTerminator::Unreachable,
         });
@@ -307,7 +305,6 @@ impl IrBuilder {
         self.current_block = block_id;
         self.blocks.push(IrBlock {
             id: block_id,
-            label: format!("block_{}", block_id.0),
             instructions: Vec::new(),
             terminator: IrTerminator::Unreachable,
         });

crates/herkos/src/ir/types.rs

@@ -113,9 +113,6 @@ pub struct IrBlock {
     /// Unique identifier for this block
     pub id: BlockId,
 
-    /// Label for Rust codegen ('block_0, 'block_1, etc.)
-    pub label: String,
-
     /// Instructions in this block (no control flow within)
     pub instructions: Vec<IrInstr>,
 
@@ -1249,7 +1246,6 @@ mod tests {
             locals: vec![],
             blocks: vec![IrBlock {
                 id: BlockId(0),
-                label: "block_0".to_string(),
                 instructions: vec![IrInstr::Const {
                     dest: VarId(0),
                     value: IrValue::I32(42),
@@ -1269,7 +1265,6 @@ mod tests {
             locals: vec![],
             blocks: vec![IrBlock {
                 id: BlockId(0),
-                label: "block_0".to_string(),
                 instructions: vec![
                     IrInstr::Const {
                         dest: VarId(0),
@@ -1300,7 +1295,6 @@ mod tests {
             locals: vec![],
             blocks: vec![IrBlock {
                 id: BlockId(0),
-                label: "block_0".to_string(),
                 instructions: vec![IrInstr::Const {
                     dest: VarId(0),
                     value: IrValue::I32(42),
@@ -1325,7 +1319,6 @@ mod tests {
             locals: vec![],
             blocks: vec![IrBlock {
                 id: BlockId(0),
-                label: "block_0".to_string(),
                 instructions: vec![
                     IrInstr::Const {
                         dest: VarId(0),
@@ -1353,7 +1346,6 @@ mod tests {
             locals: vec![],
             blocks: vec![IrBlock {
                 id: BlockId(0),
-                label: "block_0".to_string(),
                 instructions: vec![IrInstr::GlobalSet {
                     index: 1, // Second imported global
                     value: VarId(0),