Implement asm goto in MIR and MIR lowering

nbdd0121 · nbdd0121 · commit 97720030eb30 · 2023-12-28T18:35:38.000Z
diff --git a/compiler/rustc_borrowck/src/lib.rs b/compiler/rustc_borrowck/src/lib.rs
@@ -750,7 +750,8 @@ impl<'cx, 'tcx, R> rustc_mir_dataflow::ResultsVisitor<'cx, 'tcx, R> for MirBorro
                         }
                         InlineAsmOperand::Const { value: _ }
                         | InlineAsmOperand::SymFn { value: _ }
-                        | InlineAsmOperand::SymStatic { def_id: _ } => {}
+                        | InlineAsmOperand::SymStatic { def_id: _ }
+                        | InlineAsmOperand::Label { target_index: _ } => {}
                     }
                 }
             }
diff --git a/compiler/rustc_borrowck/src/polonius/loan_invalidations.rs b/compiler/rustc_borrowck/src/polonius/loan_invalidations.rs
@@ -184,7 +184,8 @@ impl<'cx, 'tcx> Visitor<'tcx> for LoanInvalidationsGenerator<'cx, 'tcx> {
                         }
                         InlineAsmOperand::Const { value: _ }
                         | InlineAsmOperand::SymFn { value: _ }
-                        | InlineAsmOperand::SymStatic { def_id: _ } => {}
+                        | InlineAsmOperand::SymStatic { def_id: _ }
+                        | InlineAsmOperand::Label { target_index: _ } => {}
                     }
                 }
             }
diff --git a/compiler/rustc_codegen_cranelift/src/global_asm.rs b/compiler/rustc_codegen_cranelift/src/global_asm.rs
@@ -78,7 +78,8 @@ pub(crate) fn codegen_global_asm_item(tcx: TyCtxt<'_>, global_asm: &mut String,
                         InlineAsmOperand::In { .. }
                         | InlineAsmOperand::Out { .. }
                         | InlineAsmOperand::InOut { .. }
-                        | InlineAsmOperand::SplitInOut { .. } => {
+                        | InlineAsmOperand::SplitInOut { .. }
+                        | InlineAsmOperand::Label { .. } => {
                             span_bug!(op_sp, "invalid operand type for global_asm!")
                         }
                     }
diff --git a/compiler/rustc_codegen_cranelift/src/inline_asm.rs b/compiler/rustc_codegen_cranelift/src/inline_asm.rs
@@ -129,6 +129,9 @@ pub(crate) fn codegen_inline_asm_terminator<'tcx>(
                 let instance = Instance::mono(fx.tcx, def_id).polymorphize(fx.tcx);
                 CInlineAsmOperand::Symbol { symbol: fx.tcx.symbol_name(instance).name.to_owned() }
             }
+            InlineAsmOperand::Label { .. } => {
+                span_bug!(span, "asm! label operands are not yet supported");
+            }
         })
         .collect::<Vec<_>>();
 
diff --git a/compiler/rustc_codegen_ssa/src/mir/block.rs b/compiler/rustc_codegen_ssa/src/mir/block.rs
@@ -1110,6 +1110,9 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
                 mir::InlineAsmOperand::SymStatic { def_id } => {
                     InlineAsmOperandRef::SymStatic { def_id }
                 }
+                mir::InlineAsmOperand::Label { target_index: _ } => {
+                    todo!();
+                }
             })
             .collect();
 
diff --git a/compiler/rustc_middle/src/mir/pretty.rs b/compiler/rustc_middle/src/mir/pretty.rs
@@ -857,6 +857,9 @@ impl<'tcx> TerminatorKind<'tcx> {
                         InlineAsmOperand::SymStatic { def_id } => {
                             write!(fmt, "sym_static {def_id:?}")?;
                         }
+                        InlineAsmOperand::Label { target_index } => {
+                            write!(fmt, "label {target_index}")?;
+                        }
                     }
                 }
                 write!(fmt, ", options({options:?}))")
diff --git a/compiler/rustc_middle/src/mir/syntax.rs b/compiler/rustc_middle/src/mir/syntax.rs
@@ -916,6 +916,10 @@ pub enum InlineAsmOperand<'tcx> {
     SymStatic {
         def_id: DefId,
     },
+    Label {
+        /// This represents the index into the `targets` array in `TerminatorKind::InlineAsm`.
+        target_index: usize,
+    },
 }
 
 /// Type for MIR `Assert` terminator error messages.
diff --git a/compiler/rustc_middle/src/mir/visit.rs b/compiler/rustc_middle/src/mir/visit.rs
@@ -593,7 +593,8 @@ macro_rules! make_mir_visitor {
                                     self.visit_constant(value, location);
                                 }
                                 InlineAsmOperand::Out { place: None, .. }
-                                | InlineAsmOperand::SymStatic { def_id: _ } => {}
+                                | InlineAsmOperand::SymStatic { def_id: _ }
+                                | InlineAsmOperand::Label { target_index: _ } => {}
                             }
                         }
                     }
diff --git a/compiler/rustc_mir_build/src/build/expr/into.rs b/compiler/rustc_mir_build/src/build/expr/into.rs
@@ -394,6 +394,23 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
                 line_spans,
             }) => {
                 use rustc_middle::{mir, thir};
+
+                let destination_block = this.cfg.start_new_block();
+                if !expr.ty.is_never() {
+                    this.cfg.push_assign_unit(
+                        destination_block,
+                        source_info,
+                        destination,
+                        this.tcx,
+                    );
+                }
+
+                let mut targets = if options.contains(InlineAsmOptions::NORETURN) {
+                    vec![]
+                } else {
+                    vec![destination_block]
+                };
+
                 let operands = operands
                     .into_iter()
                     .map(|op| match *op {
@@ -449,17 +466,24 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
                         thir::InlineAsmOperand::SymStatic { def_id } => {
                             mir::InlineAsmOperand::SymStatic { def_id }
                         }
-                        thir::InlineAsmOperand::Label { .. } => {
-                            todo!()
+                        thir::InlineAsmOperand::Label { block } => {
+                            let target = this.cfg.start_new_block();
+                            let target_index = targets.len();
+                            targets.push(target);
+
+                            let tmp = this.get_unit_temp();
+                            let target = unpack!(this.ast_block(tmp, target, block, source_info));
+                            this.cfg.terminate(
+                                target,
+                                source_info,
+                                TerminatorKind::Goto { target: destination_block },
+                            );
+
+                            mir::InlineAsmOperand::Label { target_index }
                         }
                     })
                     .collect();
 
-                if !options.contains(InlineAsmOptions::NORETURN) {
-                    this.cfg.push_assign_unit(block, source_info, destination, this.tcx);
-                }
-
-                let destination_block = this.cfg.start_new_block();
                 this.cfg.terminate(
                     block,
                     source_info,
@@ -468,11 +492,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
                         operands,
                         options,
                         line_spans,
-                        targets: if options.contains(InlineAsmOptions::NORETURN) {
-                            Vec::new()
-                        } else {
-                            vec![destination_block]
-                        },
+                        targets,
                         unwind: if options.contains(InlineAsmOptions::MAY_UNWIND) {
                             UnwindAction::Continue
                         } else {
diff --git a/compiler/rustc_mir_dataflow/src/impls/storage_liveness.rs b/compiler/rustc_mir_dataflow/src/impls/storage_liveness.rs
@@ -271,7 +271,8 @@ impl<'tcx> crate::GenKillAnalysis<'tcx> for MaybeRequiresStorage<'_, 'tcx> {
                         InlineAsmOperand::In { .. }
                         | InlineAsmOperand::Const { .. }
                         | InlineAsmOperand::SymFn { .. }
-                        | InlineAsmOperand::SymStatic { .. } => {}
+                        | InlineAsmOperand::SymStatic { .. }
+                        | InlineAsmOperand::Label { .. } => {}
                     }
                 }
             }
diff --git a/compiler/rustc_mir_dataflow/src/move_paths/builder.rs b/compiler/rustc_mir_dataflow/src/move_paths/builder.rs
@@ -505,7 +505,8 @@ impl<'b, 'a, 'tcx, F: Fn(Ty<'tcx>) -> bool> Gatherer<'b, 'a, 'tcx, F> {
                         }
                         InlineAsmOperand::Const { value: _ }
                         | InlineAsmOperand::SymFn { value: _ }
-                        | InlineAsmOperand::SymStatic { def_id: _ } => {}
+                        | InlineAsmOperand::SymStatic { def_id: _ }
+                        | InlineAsmOperand::Label { target_index: _ } => {}
                     }
                 }
             }
diff --git a/compiler/rustc_mir_transform/src/dest_prop.rs b/compiler/rustc_mir_transform/src/dest_prop.rs
@@ -642,7 +642,8 @@ impl WriteInfo {
                         }
                         InlineAsmOperand::Const { .. }
                         | InlineAsmOperand::SymFn { .. }
-                        | InlineAsmOperand::SymStatic { .. } => (),
+                        | InlineAsmOperand::SymStatic { .. }
+                        | InlineAsmOperand::Label { .. } => {}
                     }
                 }
             }
diff --git a/compiler/rustc_smir/src/rustc_smir/convert/mir.rs b/compiler/rustc_smir/src/rustc_smir/convert/mir.rs
@@ -555,7 +555,8 @@ impl<'tcx> Stable<'tcx> for mir::InlineAsmOperand<'tcx> {
             }
             InlineAsmOperand::Const { .. }
             | InlineAsmOperand::SymFn { .. }
-            | InlineAsmOperand::SymStatic { .. } => (None, None),
+            | InlineAsmOperand::SymStatic { .. }
+            | InlineAsmOperand::Label { .. } => (None, None),
         };
 
         stable_mir::mir::InlineAsmOperand { in_value, out_place, raw_rpr: format!("{self:?}") }

Original file line number	Diff line number	Diff line change
`@@ -750,7 +750,8 @@ impl<'cx, 'tcx, R> rustc_mir_dataflow::ResultsVisitor<'cx, 'tcx, R> for MirBorro`
`750`	`750`	`}`
`751`	`751`	`InlineAsmOperand::Const { value: _ }`
`752`	`752`	`\| InlineAsmOperand::SymFn { value: _ }`
`753`		`- \| InlineAsmOperand::SymStatic { def_id: _ } => {}`
	`753`	`+ \| InlineAsmOperand::SymStatic { def_id: _ }`
	`754`	`+ \| InlineAsmOperand::Label { target_index: _ } => {}`
`754`	`755`	`}`
`755`	`756`	`}`
`756`	`757`	`}`
Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,8 @@ impl<'cx, 'tcx> Visitor<'tcx> for LoanInvalidationsGenerator<'cx, 'tcx> {`
`184`	`184`	`}`
`185`	`185`	`InlineAsmOperand::Const { value: _ }`
`186`	`186`	`\| InlineAsmOperand::SymFn { value: _ }`
`187`		`- \| InlineAsmOperand::SymStatic { def_id: _ } => {}`
	`187`	`+ \| InlineAsmOperand::SymStatic { def_id: _ }`
	`188`	`+ \| InlineAsmOperand::Label { target_index: _ } => {}`
`188`	`189`	`}`
`189`	`190`	`}`
`190`	`191`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,8 @@ pub(crate) fn codegen_global_asm_item(tcx: TyCtxt<'_>, global_asm: &mut String,`
`78`	`78`	`InlineAsmOperand::In { .. }`
`79`	`79`	`\| InlineAsmOperand::Out { .. }`
`80`	`80`	`\| InlineAsmOperand::InOut { .. }`
`81`		`- \| InlineAsmOperand::SplitInOut { .. } => {`
	`81`	`+ \| InlineAsmOperand::SplitInOut { .. }`
	`82`	`+ \| InlineAsmOperand::Label { .. } => {`
`82`	`83`	`span_bug!(op_sp, "invalid operand type for global_asm!")`
`83`	`84`	`}`
`84`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -129,6 +129,9 @@ pub(crate) fn codegen_inline_asm_terminator<'tcx>(`
`129`	`129`	`let instance = Instance::mono(fx.tcx, def_id).polymorphize(fx.tcx);`
`130`	`130`	`CInlineAsmOperand::Symbol { symbol: fx.tcx.symbol_name(instance).name.to_owned() }`
`131`	`131`	`}`
	`132`	`+ InlineAsmOperand::Label { .. } => {`
	`133`	`+ span_bug!(span, "asm! label operands are not yet supported");`
	`134`	`+ }`
`132`	`135`	`})`
`133`	`136`	`.collect::<Vec<_>>();`
`134`	`137`
Original file line number	Diff line number	Diff line change
`@@ -1110,6 +1110,9 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {`
`1110`	`1110`	`mir::InlineAsmOperand::SymStatic { def_id } => {`
`1111`	`1111`	`InlineAsmOperandRef::SymStatic { def_id }`
`1112`	`1112`	`}`
	`1113`	`+ mir::InlineAsmOperand::Label { target_index: _ } => {`
	`1114`	`+ todo!();`
	`1115`	`+ }`
`1113`	`1116`	`})`
`1114`	`1117`	`.collect();`
`1115`	`1118`
Original file line number	Diff line number	Diff line change
`@@ -857,6 +857,9 @@ impl<'tcx> TerminatorKind<'tcx> {`
`857`	`857`	`InlineAsmOperand::SymStatic { def_id } => {`
`858`	`858`	`write!(fmt, "sym_static {def_id:?}")?;`
`859`	`859`	`}`
	`860`	`+ InlineAsmOperand::Label { target_index } => {`
	`861`	`+ write!(fmt, "label {target_index}")?;`
	`862`	`+ }`
`860`	`863`	`}`
`861`	`864`	`}`
`862`	`865`	`write!(fmt, ", options({options:?}))")`
Original file line number	Diff line number	Diff line change
`@@ -593,7 +593,8 @@ macro_rules! make_mir_visitor {`
`593`	`593`	`self.visit_constant(value, location);`
`594`	`594`	`}`
`595`	`595`	`InlineAsmOperand::Out { place: None, .. }`
`596`		`- \| InlineAsmOperand::SymStatic { def_id: _ } => {}`
	`596`	`+ \| InlineAsmOperand::SymStatic { def_id: _ }`
	`597`	`+ \| InlineAsmOperand::Label { target_index: _ } => {}`
`597`	`598`	`}`
`598`	`599`	`}`
`599`	`600`	`}`
Original file line number	Diff line number	Diff line change
`@@ -271,7 +271,8 @@ impl<'tcx> crate::GenKillAnalysis<'tcx> for MaybeRequiresStorage<'_, 'tcx> {`
`271`	`271`	`InlineAsmOperand::In { .. }`
`272`	`272`	`\| InlineAsmOperand::Const { .. }`
`273`	`273`	`\| InlineAsmOperand::SymFn { .. }`
`274`		`- \| InlineAsmOperand::SymStatic { .. } => {}`
	`274`	`+ \| InlineAsmOperand::SymStatic { .. }`
	`275`	`+ \| InlineAsmOperand::Label { .. } => {}`
`275`	`276`	`}`
`276`	`277`	`}`
`277`	`278`	`}`