Add Op registration to symbol table inside OpBuilder

codegen/masm/src/lower/expected/utils_emit_binary_search_1_case.hir

@@ -1,13 +1,13 @@
 public builtin.function @test(v0: u32, v1: u32) -> u32 {
-^block0(v0: u32, v1: u32):
+^block1(v0: u32, v1: u32):
     v2 = scf.index_switch v0 : u32 
     case 0 {
-    ^block1:
+    ^block2:
         v3 = arith.constant 0 : u32;
         scf.yield v3;
     }
     default {
-    ^block2:
+    ^block3:
         v4 = arith.mul v0, v1 : u32 #[overflow = checked];
         scf.yield v4;
     };

codegen/masm/src/lower/expected/utils_emit_binary_search_2_cases.hir

@@ -1,18 +1,18 @@
 public builtin.function @test(v0: u32, v1: u32) -> u32 {
-^block0(v0: u32, v1: u32):
+^block1(v0: u32, v1: u32):
     v2 = scf.index_switch v0 : u32 
     case 0 {
-    ^block1:
+    ^block2:
         v3 = arith.constant 0 : u32;
         scf.yield v3;
     }
     case 1 {
-    ^block2:
+    ^block3:
         v4 = arith.constant 1 : u32;
         scf.yield v4;
     }
     default {
-    ^block3:
+    ^block4:
         v5 = arith.mul v0, v1 : u32 #[overflow = checked];
         scf.yield v5;
     };

codegen/masm/src/lower/expected/utils_emit_binary_search_3_cases.hir

@@ -1,23 +1,23 @@
 public builtin.function @test(v0: u32, v1: u32) -> u32 {
-^block0(v0: u32, v1: u32):
+^block1(v0: u32, v1: u32):
     v2 = scf.index_switch v0 : u32 
     case 0 {
-    ^block1:
+    ^block2:
         v3 = arith.constant 0 : u32;
         scf.yield v3;
     }
     case 1 {
-    ^block2:
+    ^block3:
         v4 = arith.constant 1 : u32;
         scf.yield v4;
     }
     case 2 {
-    ^block3:
+    ^block4:
         v5 = arith.constant 2 : u32;
         scf.yield v5;
     }
     default {
-    ^block4:
+    ^block5:
         v6 = arith.mul v0, v1 : u32 #[overflow = checked];
         scf.yield v6;
     };

codegen/masm/src/lower/expected/utils_emit_binary_search_4_cases.hir

@@ -1,28 +1,28 @@
 public builtin.function @test(v0: u32, v1: u32) -> u32 {
-^block0(v0: u32, v1: u32):
+^block1(v0: u32, v1: u32):
     v2 = scf.index_switch v0 : u32 
     case 0 {
-    ^block1:
+    ^block2:
         v3 = arith.constant 0 : u32;
         scf.yield v3;
     }
     case 1 {
-    ^block2:
+    ^block3:
         v4 = arith.constant 1 : u32;
         scf.yield v4;
     }
     case 2 {
-    ^block3:
+    ^block4:
         v5 = arith.constant 2 : u32;
         scf.yield v5;
     }
     case 3 {
-    ^block4:
+    ^block5:
         v6 = arith.constant 3 : u32;
         scf.yield v6;
     }
     default {
-    ^block5:
+    ^block6:
         v7 = arith.mul v0, v1 : u32 #[overflow = checked];
         scf.yield v7;
     };

codegen/masm/src/lower/expected/utils_emit_binary_search_5_cases.hir

@@ -1,33 +1,33 @@
 public builtin.function @test(v0: u32, v1: u32) -> u32 {
-^block0(v0: u32, v1: u32):
+^block1(v0: u32, v1: u32):
     v2 = scf.index_switch v0 : u32 
     case 0 {
-    ^block1:
+    ^block2:
         v3 = arith.constant 0 : u32;
         scf.yield v3;
     }
     case 1 {
-    ^block2:
+    ^block3:
         v4 = arith.constant 1 : u32;
         scf.yield v4;
     }
     case 2 {
-    ^block3:
+    ^block4:
         v5 = arith.constant 2 : u32;
         scf.yield v5;
     }
     case 3 {
-    ^block4:
+    ^block5:
         v6 = arith.constant 3 : u32;
         scf.yield v6;
     }
     case 4 {
-    ^block5:
+    ^block6:
         v7 = arith.constant 4 : u32;
         scf.yield v7;
     }
     default {
-    ^block6:
+    ^block7:
         v8 = arith.mul v0, v1 : u32 #[overflow = checked];
         scf.yield v8;
     };

codegen/masm/src/lower/expected/utils_emit_binary_search_7_cases.hir

@@ -1,43 +1,43 @@
 public builtin.function @test(v0: u32, v1: u32) -> u32 {
-^block0(v0: u32, v1: u32):
+^block1(v0: u32, v1: u32):
     v2 = scf.index_switch v0 : u32 
     case 0 {
-    ^block1:
+    ^block2:
         v3 = arith.constant 0 : u32;
         scf.yield v3;
     }
     case 1 {
-    ^block2:
+    ^block3:
         v4 = arith.constant 1 : u32;
         scf.yield v4;
     }
     case 2 {
-    ^block3:
+    ^block4:
         v5 = arith.constant 2 : u32;
         scf.yield v5;
     }
     case 3 {
-    ^block4:
+    ^block5:
         v6 = arith.constant 3 : u32;
         scf.yield v6;
     }
     case 4 {
-    ^block5:
+    ^block6:
         v7 = arith.constant 4 : u32;
         scf.yield v7;
     }
     case 5 {
-    ^block6:
+    ^block7:
         v8 = arith.constant 5 : u32;
         scf.yield v8;
     }
     case 6 {
-    ^block7:
+    ^block8:
         v9 = arith.constant 6 : u32;
         scf.yield v9;
     }
     default {
-    ^block8:
+    ^block9:
         v10 = arith.mul v0, v1 : u32 #[overflow = checked];
         scf.yield v10;
     };

codegen/masm/src/lower/expected/utils_emit_if.hir

@@ -1,13 +1,13 @@
 public builtin.function @test(v0: u32, v1: u32) -> u32 {
-^block0(v0: u32, v1: u32):
+^block1(v0: u32, v1: u32):
     v2 = arith.constant 0 : u32;
     v3 = arith.eq v0, v1 : i1;
     v4 = scf.if v3 : u32 {
-    ^block1:
+    ^block2:
         v5 = arith.constant 1 : u32;
         scf.yield v5;
     } else {
-    ^block2:
+    ^block3:
         v6 = arith.mul v0, v2 : u32 #[overflow = checked];
         scf.yield v6;
     };

codegen/masm/src/lower/expected/utils_emit_if_nested.hir

@@ -1,19 +1,19 @@
 public builtin.function @test(v0: u32, v1: u32) -> u32 {
-^block0(v0: u32, v1: u32):
+^block1(v0: u32, v1: u32):
     v2 = arith.eq v0, v1 : i1;
     v3 = scf.if v2 : u32 {
-    ^block1:
+    ^block2:
         v4 = arith.constant 1 : u32;
         scf.yield v4;
     } else {
-    ^block2:
+    ^block3:
         v5 = arith.lt v0, v1 : i1;
         v6 = scf.if v5 : u32 {
-        ^block3:
+        ^block4:
             v7 = arith.constant 2 : u32;
             scf.yield v7;
         } else {
-        ^block4:
+        ^block5:
             v8 = arith.mul v0, v1 : u32 #[overflow = checked];
             scf.yield v8;
         };

codegen/masm/src/lower/utils.rs

@@ -493,11 +493,11 @@ mod tests {
     use midenc_dialect_scf::StructuredControlFlowOpBuilder;
     use midenc_expect_test::expect_file;
     use midenc_hir::{
-        dialects::builtin::{self, BuiltinOpBuilder, FunctionBuilder, FunctionRef},
+        dialects::builtin::{self, BuiltinOpBuilder, FunctionBuilder, FunctionRef, WorldBuilder},
         formatter::PrettyPrint,
         pass::AnalysisManager,
         version::Version,
-        AbiParam, Context, Ident, OpBuilder, Signature, Type,
+        AbiParam, BuilderExt, Context, Ident, OpBuilder, Signature, SymbolTable, Type,
     };
     use midenc_hir_analysis::analyses::LivenessAnalysis;
 
@@ -511,12 +511,18 @@ mod tests {
 
         let mut builder = OpBuilder::new(context.clone());
 
+        let world_ref = builder.create::<builtin::World, ()>(Default::default())()
+            .expect("Error unrelated to test: Failed to build world.");
+        let mut world_builder = WorldBuilder::new(world_ref);
+        let world = &mut world_builder.world.borrow_mut().as_symbol_table_ref();
+
         let function_ref = builder.create_function(
             Ident::with_empty_span("test".into()),
             Signature::new(
                 [AbiParam::new(Type::U32), AbiParam::new(Type::U32)],
                 [AbiParam::new(Type::U32)],
             ),
+            world,
         )?;
 
         let (a, b) = {
@@ -597,12 +603,18 @@ mod tests {
 
         let mut builder = OpBuilder::new(context.clone());
 
+        let world_ref = builder.create::<builtin::World, ()>(Default::default())()
+            .expect("Error unrelated to test: Failed to build world.");
+        let mut world_builder = WorldBuilder::new(world_ref);
+        let world = &mut world_builder.world.borrow_mut().as_symbol_table_ref();
+
         let function_ref = builder.create_function(
             Ident::with_empty_span("test".into()),
             Signature::new(
                 [AbiParam::new(Type::U32), AbiParam::new(Type::U32)],
                 [AbiParam::new(Type::U32)],
             ),
+            world,
         )?;
 
         let (a, b) = {
@@ -826,12 +838,18 @@ mod tests {
     ) -> Result<(FunctionRef, masm::Block), Report> {
         let mut builder = OpBuilder::new(context.clone());
 
+        let world_ref = builder.create::<builtin::World, ()>(Default::default())()
+            .expect("Error unrelated to test: Failed to build world.");
+        let mut world_builder = WorldBuilder::new(world_ref);
+        let world = &mut world_builder.world.borrow_mut().as_symbol_table_ref();
+
         let function_ref = builder.create_function(
             Ident::with_empty_span("test".into()),
             Signature::new(
                 [AbiParam::new(Type::U32), AbiParam::new(Type::U32)],
                 [AbiParam::new(Type::U32)],
             ),
+            world,
         )?;
 
         let (a, b) = {