enabled IR debug and attempted to fix codegen

Signed-off-by: Ashwin Naren <arihant2math@gmail.com>
RustPython · youknowone · Jan 25, 2025 · Jan 19, 2025 · Jan 19, 2025 · Jan 20, 2025
commit aa6a0409666b427a1364e8d61b78cd3527562e55
diff --git a/compiler/codegen/src/compile.rs b/compiler/codegen/src/compile.rs
@@ -2054,7 +2054,7 @@ impl Compiler {
     ) -> CompileResult<()> {
         self.compile_expression(subject)?;
         // Block at the end of the switch statement that we jump to after finishing a branch
-        let pattern_blocks = std::iter::repeat_with(|| self.new_block())
+        let mut pattern_blocks = std::iter::repeat_with(|| self.new_block())
             .take(cases.len() + 1)
             .collect::<Vec<_>>();
         eprintln!("created pattern_blocks: {:?} - {:?}(end block)", pattern_blocks.first().unwrap(), pattern_blocks.last().unwrap());
@@ -2118,7 +2118,21 @@ impl Compiler {
             }
             self.compile_statements(&m.body)?;
         }
-
+        let block = self.new_block();
+        pattern_blocks.push(block);
+        let code = self.current_code_info();
+        let _ = pattern_blocks.iter()
+            .zip(pattern_blocks.iter().skip(1))
+            .for_each(|(a, b)| {
+                eprintln!("linking: {} -> {}", a.0, b.0);
+                code.blocks[a.0 as usize].next = *b;
+        });
+        self.switch_to_block(*pattern_blocks.last().unwrap());
+        let code = self.current_code_info();
+        for block in pattern_blocks {
+            let b = &code.blocks[block.0 as usize];
+            eprintln!("block: {} -> {}", block.0, b.next.0);
+        }
         Ok(())
     }
 

diff --git a/compiler/codegen/src/ir.rs b/compiler/codegen/src/ir.rs
@@ -227,7 +227,7 @@ impl CodeInfo {
         let mut start_depths = vec![u32::MAX; self.blocks.len()];
         start_depths[0] = 0;
         stack.push(BlockIdx(0));
-        const DEBUG: bool = false;
+        const DEBUG: bool = true;
         'process_blocks: while let Some(block) = stack.pop() {
             let mut depth = start_depths[block.idx()];
             if DEBUG {