Refactor.

sisshiki1969 · Jan 30, 2025 · de78026 · de78026
1 parent a229491
commit de78026
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 13 deletions.
diff --git a/monoruby/src/compiler/jitgen.rs b/monoruby/src/compiler/jitgen.rs
@@ -720,7 +720,6 @@ impl Codegen {
             let entry = ctx.resolve_label(&mut self.jit, entry);
             self.gen_asm(ir, store, &mut ctx, Some((entry, exit)));
         }
-        assert!(ctx.continue_label.is_none());
 
         self.jit.finalize();
 

diff --git a/monoruby/src/compiler/jitgen/context.rs b/monoruby/src/compiler/jitgen/context.rs
@@ -96,10 +96,6 @@ pub struct JitContext {
     ///
     pub(super) continue_bridges: HashMap<BasicBlockId, (AsmIr, Option<BasicBlockId>)>,
     ///
-    /// Information for continuation bridge.
-    ///
-    pub(super) continue_label: Option<JitLabel>,
-    ///
     /// Information for `JitLabel`s`.
     ///
     labels: Vec<Option<DestLabel>>,
@@ -168,7 +164,6 @@ impl JitContext {
             self_ty,
             bridges: vec![],
             continue_bridges: HashMap::default(),
-            continue_label: None,
             labels,
             class_version,
             ir: vec![],
@@ -201,7 +196,6 @@ impl JitContext {
             self_ty: None,
             bridges: vec![],
             continue_bridges: HashMap::default(),
-            continue_label: None,
             labels: vec![],
             class_version: 0,
             ir: vec![],

diff --git a/monoruby/src/compiler/jitgen/merge.rs b/monoruby/src/compiler/jitgen/merge.rs
@@ -56,14 +56,11 @@ impl JitContext {
         } else {
             #[cfg(feature = "jit-debug")]
             eprintln!("\n===gen_merge bb: {:?}", bbid);
-            self.incoming_context_method(func, bbid)
+            self.incoming_context_method(ir, func, bbid)
         };
 
         #[cfg(feature = "jit-debug")]
         eprintln!("===merge_end");
-        if let Some(entry) = std::mem::take(&mut self.continue_label) {
-            ir.push(AsmInst::Label(entry));
-        }
         res
     }
 
@@ -134,17 +131,17 @@ impl JitContext {
 
     fn incoming_context_method(
         &mut self,
+        ir: &mut AsmIr,
         func: &ISeqInfo,
         bbid: BasicBlockId,
     ) -> Option<BBContext> {
         let mut entries = self.branch_map.remove(&bbid)?;
 
         if entries.len() == 1 {
             let entry = entries.remove(0);
-            assert!(self.continue_label.is_none());
             match entry.mode {
                 BranchMode::Side { dest } | BranchMode::Branch { dest } => {
-                    self.continue_label = Some(dest);
+                    ir.push(AsmInst::Label(dest));
                 }
                 BranchMode::Continue => {}
             }