diff options
| author | bors <bors@rust-lang.org> | 2024-08-14 14:13:48 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-08-14 14:13:48 +0000 |
| commit | 355a307a874077eff12bd99c6fd3eb6bfda79993 (patch) | |
| tree | 459cf7ef097c14f40256cb7e0bcbceafd74b9f8d /compiler/rustc_ast_lowering/src/asm.rs | |
| parent | 0f442e265c165c0a78633bef98de18517815150c (diff) | |
| parent | 4d8c0b3b5dc6c4476946ab713e1d01a1d40a8bef (diff) | |
| download | rust-355a307a874077eff12bd99c6fd3eb6bfda79993.tar.gz rust-355a307a874077eff12bd99c6fd3eb6bfda79993.zip | |
Auto merge of #129092 - jieyouxu:rollup-z2522nm, r=jieyouxu
Rollup of 6 pull requests Successful merges: - #128570 (Stabilize `asm_const`) - #128828 (`-Znext-solver` caching) - #128954 (Explicitly specify type parameter on FromResidual for Option and ControlFlow.) - #129059 (Record the correct target type when coercing fn items/closures to pointers) - #129071 (Port `run-make/sysroot-crates-are-unstable` to rmake) - #129088 (Make the rendered html doc for rustc better) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_ast_lowering/src/asm.rs')
| -rw-r--r-- | compiler/rustc_ast_lowering/src/asm.rs | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/compiler/rustc_ast_lowering/src/asm.rs b/compiler/rustc_ast_lowering/src/asm.rs index 8acca78379b..7d9d689e6d7 100644 --- a/compiler/rustc_ast_lowering/src/asm.rs +++ b/compiler/rustc_ast_lowering/src/asm.rs @@ -183,20 +183,9 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> { out_expr: out_expr.as_ref().map(|expr| self.lower_expr(expr)), } } - InlineAsmOperand::Const { anon_const } => { - if !self.tcx.features().asm_const { - feature_err( - sess, - sym::asm_const, - *op_sp, - fluent::ast_lowering_unstable_inline_assembly_const_operands, - ) - .emit(); - } - hir::InlineAsmOperand::Const { - anon_const: self.lower_anon_const_to_anon_const(anon_const), - } - } + InlineAsmOperand::Const { anon_const } => hir::InlineAsmOperand::Const { + anon_const: self.lower_anon_const_to_anon_const(anon_const), + }, InlineAsmOperand::Sym { sym } => { let static_def_id = self .resolver |
