bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

validator: move force inline check

Browse source
This commit is contained in:
David Wood 2024-12-12 15:58:10 +00:00
parent 90066c0df3
commit 5f316f5e00
No known key found for this signature in database
1 changed files with 10 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

33
compiler/rustc_mir_transform/src/validate.rs
View file

@ -80,7 +80,7 @@ impl<'tcx> crate::MirPass<'tcx> for Validator {
cfg_checker.fail(location, msg);
}
if let MirPhase::Runtime(phase) = body.phase {
if let MirPhase::Runtime(_) = body.phase {
if let ty::InstanceKind::Item(_) = body.source.instance {
if body.has_free_regions() {
cfg_checker.fail(
@ -89,27 +89,6 @@ impl<'tcx> crate::MirPass<'tcx> for Validator {
);
}
}
if phase >= RuntimePhase::Optimized
&& body
.basic_blocks
.iter()
.filter_map(|bb| match &bb.terminator().kind {
TerminatorKind::Call { func, .. }
| TerminatorKind::TailCall { func, .. } => Some(func),
_ => None,
})
.filter_map(|func| match func.ty(&body.local_decls, tcx).kind() {
ty::FnDef(did, ..) => Some(did),
_ => None,
})
.any(|did| matches!(tcx.codegen_fn_attrs(did).inline, InlineAttr::Force { .. }))
{
cfg_checker.fail(
Location::START,
"`#[rustc_force_inline]`-annotated function not inlined",
);
}
}
}
}
@ -388,7 +367,8 @@ impl<'a, 'tcx> Visitor<'tcx> for CfgChecker<'a, 'tcx> {
self.check_edge(location, *target, EdgeKind::Normal);
self.check_unwind_edge(location, *unwind);
}
TerminatorKind::Call { args, .. } | TerminatorKind::TailCall { args, .. } => {
TerminatorKind::Call { func, args, .. }
| TerminatorKind::TailCall { func, args, .. } => {
// FIXME(explicit_tail_calls): refactor this & add tail-call specific checks
if let TerminatorKind::Call { target, unwind, destination, .. } = terminator.kind {
if let Some(target) = target {
@ -441,6 +421,13 @@ impl<'a, 'tcx> Visitor<'tcx> for CfgChecker<'a, 'tcx> {
}
}
}
if let ty::FnDef(did, ..) = func.ty(&self.body.local_decls, self.tcx).kind()
&& self.body.phase >= MirPhase::Runtime(RuntimePhase::Optimized)
&& matches!(self.tcx.codegen_fn_attrs(did).inline, InlineAttr::Force { .. })
{
self.fail(location, "`#[rustc_force_inline]`-annotated function not inlined");
}
}
TerminatorKind::Assert { target, unwind, .. } => {
self.check_edge(location, *target, EdgeKind::Normal);