user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move codegen_naked_asm call up into MonoItem::define

Browse source
This commit is contained in:
bjorn3 2024-12-12 19:51:37 +00:00
parent 764d3a50a3
commit a73eba99f7
3 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
compiler/rustc_codegen_ssa/src/mir/mod.rs
View file

@ -20,7 +20,7 @@ mod coverageinfo;
pub mod debuginfo;
mod intrinsic;
mod locals;
mod naked_asm;
pub(crate) mod naked_asm;
pub mod operand;
pub mod place;
mod rvalue;
@ -170,11 +170,6 @@ pub fn codegen_mir<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>>(
) {
assert!(!instance.args.has_infer());
if cx.tcx().codegen_fn_attrs(instance.def_id()).flags.contains(CodegenFnAttrFlags::NAKED) {
crate::mir::naked_asm::codegen_naked_asm::<Bx::CodegenCx>(cx, instance);
return;
}
let tcx = cx.tcx();
let llfn = cx.get_fn(instance);

3
compiler/rustc_codegen_ssa/src/mir/naked_asm.rs
View file

@ -4,7 +4,7 @@ use rustc_hir::def_id::DefId;
use rustc_middle::mir::mono::{Linkage, MonoItem, MonoItemData, Visibility};
use rustc_middle::mir::{InlineAsmOperand, START_BLOCK};
use rustc_middle::ty::layout::{FnAbiOf, LayoutOf, TyAndLayout};
use rustc_middle::ty::{Instance, Ty, TyCtxt};
use rustc_middle::ty::{Instance, Ty, TyCtxt, TypeVisitableExt};
use rustc_middle::{bug, span_bug, ty};
use rustc_span::sym;
use rustc_target::callconv::{ArgAbi, FnAbi, PassMode};
@ -25,6 +25,7 @@ pub(crate) fn codegen_naked_asm<
cx: &'a Cx,
instance: Instance<'tcx>,
) {
assert!(!instance.args.has_infer());
let mir = cx.tcx().instance_mir(instance.def);
let rustc_middle::mir::TerminatorKind::InlineAsm {

12
compiler/rustc_codegen_ssa/src/mono_item.rs
View file

@ -7,6 +7,7 @@ use rustc_middle::ty::layout::{HasTyCtxt, LayoutOf};
use rustc_middle::{span_bug, ty};
use tracing::debug;
use crate::mir::naked_asm;
use crate::traits::*;
use crate::{base, common};
@ -99,7 +100,16 @@ impl<'a, 'tcx: 'a> MonoItemExt<'a, 'tcx> for MonoItem<'tcx> {
}
}
MonoItem::Fn(instance) => {
base::codegen_instance::<Bx>(cx, instance);
if cx
.tcx()
.codegen_fn_attrs(instance.def_id())
.flags
.contains(CodegenFnAttrFlags::NAKED)
{
naked_asm::codegen_naked_asm::<Bx::CodegenCx>(cx, instance);
} else {
base::codegen_instance::<Bx>(cx, instance);
}
}
}