bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

inliner: Make inline_call infallible

Browse source 
The inliner does not support inlining of divering calls. Reject them
early on and turn `inline_call` into an infallible operation.
This commit is contained in:
Tomasz Miąsko 2020-11-06 00:00:00 +00:00
parent fe8f026908
commit b7f16c56d1
1 changed files with 6 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

23
compiler/rustc_mir/src/transform/inline.rs
View file

@ -138,12 +138,7 @@ impl Inliner<'tcx> {
); );
let start = caller_body.basic_blocks().len(); let start = caller_body.basic_blocks().len();
debug!("attempting to inline callsite {:?} - body={:?}", callsite, callee_body); self.inline_call(callsite, caller_body, callee_body);
if !self.inline_call(callsite, caller_body, callee_body) {
debug!("attempting to inline callsite {:?} - failure", callsite);
continue;
}
debug!("attempting to inline callsite {:?} - success", callsite);
// Add callsites from inlined function // Add callsites from inlined function
for (bb, bb_data) in caller_body.basic_blocks().iter_enumerated().skip(start) { for (bb, bb_data) in caller_body.basic_blocks().iter_enumerated().skip(start) {
@ -179,7 +174,8 @@ impl Inliner<'tcx> {
// Only consider direct calls to functions // Only consider direct calls to functions
let terminator = bb_data.terminator(); let terminator = bb_data.terminator();
if let TerminatorKind::Call { func: ref op, .. } = terminator.kind { // FIXME: Handle inlining of diverging calls
if let TerminatorKind::Call { func: ref op, destination: Some(_), .. } = terminator.kind {
if let ty::FnDef(callee_def_id, substs) = *op.ty(caller_body, self.tcx).kind() { if let ty::FnDef(callee_def_id, substs) = *op.ty(caller_body, self.tcx).kind() {
// To resolve an instance its substs have to be fully normalized, so // To resolve an instance its substs have to be fully normalized, so
// we do this here. // we do this here.
@ -397,12 +393,11 @@ impl Inliner<'tcx> {
callsite: CallSite<'tcx>, callsite: CallSite<'tcx>,
caller_body: &mut Body<'tcx>, caller_body: &mut Body<'tcx>,
mut callee_body: Body<'tcx>, mut callee_body: Body<'tcx>,
) -> bool { ) {
let terminator = caller_body[callsite.bb].terminator.take().unwrap(); let terminator = caller_body[callsite.bb].terminator.take().unwrap();
match terminator.kind { match terminator.kind {
// FIXME: Handle inlining of diverging calls
TerminatorKind::Call { args, destination: Some(destination), cleanup, .. } => { TerminatorKind::Call { args, destination: Some(destination), cleanup, .. } => {
debug!("inlined {:?} into {:?}", callsite.callee, caller_body.source); debug!("inlined {} into {:?}", callsite.callee, caller_body.source.instance);
// If the call is something like `a[*i] = f(i)`, where // If the call is something like `a[*i] = f(i)`, where
// `i : &mut usize`, then just duplicating the `a[*i]` // `i : &mut usize`, then just duplicating the `a[*i]`
@ -519,14 +514,8 @@ impl Inliner<'tcx> {
matches!(constant.literal.val, ConstKind::Unevaluated(_, _, _)) matches!(constant.literal.val, ConstKind::Unevaluated(_, _, _))
}), }),
); );
true
}
kind => {
caller_body[callsite.bb].terminator =
Some(Terminator { source_info: terminator.source_info, kind });
false
} }
kind => bug!("unexpected terminator kind {:?}", kind),
} }
} }