Refactor.

sisshiki1969 · Jan 30, 2025 · 09452fb · 09452fb
1 parent ba91477
commit 09452fb
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/monoruby/src/compiler/jitgen.rs b/monoruby/src/compiler/jitgen.rs
@@ -702,7 +702,7 @@ impl Codegen {
             self.gen_asm(ir, store, &mut ctx, None);
             // generate machine code for bridges
             if let Some(bbid) = bbid
-                && let Some((ir, exit)) = ctx.continue_bridges.remove(&bbid)
+                && let Some((ir, exit)) = ctx.inline_bridges.remove(&bbid)
             {
                 self.gen_asm(ir, store, &mut ctx, None);
                 if let Some(exit) = exit {
@@ -716,7 +716,7 @@ impl Codegen {
         }
 
         // generate machine code for bridges
-        for (ir, entry, exit) in std::mem::take(&mut ctx.bridges) {
+        for (ir, entry, exit) in std::mem::take(&mut ctx.outline_bridges) {
             let entry = ctx.resolve_label(&mut self.jit, entry);
             self.gen_asm(ir, store, &mut ctx, Some((entry, exit)));
         }

diff --git a/monoruby/src/compiler/jitgen/context.rs b/monoruby/src/compiler/jitgen/context.rs
@@ -90,11 +90,11 @@ pub struct JitContext {
     ///
     /// Information for bridges.
     ///
-    pub(super) bridges: Vec<(AsmIr, JitLabel, BasicBlockId)>,
+    pub(super) outline_bridges: Vec<(AsmIr, JitLabel, BasicBlockId)>,
     ///
     /// Information for continue bridges.
     ///
-    pub(super) continue_bridges: HashMap<BasicBlockId, (AsmIr, Option<BasicBlockId>)>,
+    pub(super) inline_bridges: HashMap<BasicBlockId, (AsmIr, Option<BasicBlockId>)>,
     ///
     /// Information for `JitLabel`s`.
     ///
@@ -162,8 +162,8 @@ impl JitContext {
             local_num,
             self_class,
             self_ty,
-            bridges: vec![],
-            continue_bridges: HashMap::default(),
+            outline_bridges: vec![],
+            inline_bridges: HashMap::default(),
             labels,
             class_version,
             ir: vec![],
@@ -194,8 +194,8 @@ impl JitContext {
             local_num,
             self_class: NIL_CLASS,
             self_ty: None,
-            bridges: vec![],
-            continue_bridges: HashMap::default(),
+            outline_bridges: vec![],
+            inline_bridges: HashMap::default(),
             labels: vec![],
             class_version: 0,
             ir: vec![],

diff --git a/monoruby/src/compiler/jitgen/merge.rs b/monoruby/src/compiler/jitgen/merge.rs
@@ -28,9 +28,9 @@ impl JitContext {
                 }
                 bbctx.gen_bridge_for_target(&mut ir, &target_ctx, pc);
                 match cont {
-                    BranchMode::Side { dest } => self.bridges.push((ir, dest, bbid)),
+                    BranchMode::Side { dest } => self.outline_bridges.push((ir, dest, bbid)),
                     BranchMode::Branch { .. } => {
-                        self.continue_bridges.insert(src_bb, (ir, Some(bbid)));
+                        self.inline_bridges.insert(src_bb, (ir, Some(bbid)));
                     }
                     BranchMode::Continue => unreachable!(),
                 }
@@ -187,12 +187,12 @@ impl JitContext {
             }
             bbctx.gen_bridge_for_target(&mut ir, &target_ctx, pc);
             match mode {
-                BranchMode::Side { dest } => self.bridges.push((ir, dest, bbid)),
+                BranchMode::Side { dest } => self.outline_bridges.push((ir, dest, bbid)),
                 BranchMode::Branch { .. } => {
-                    self.continue_bridges.insert(src_bb, (ir, Some(bbid)));
+                    self.inline_bridges.insert(src_bb, (ir, Some(bbid)));
                 }
                 BranchMode::Continue => {
-                    self.continue_bridges.insert(src_bb, (ir, None));
+                    self.inline_bridges.insert(src_bb, (ir, None));
                 }
             }
             //}