bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #106139 - cjgillot:mir-inline-location, r=eholk

Browse source 
Give the correct track-caller location with MIR inlining.

Fixes https://github.com/rust-lang/rust/issues/105538
This commit is contained in:
bors 2022-12-29 08:06:03 +00:00
commit 11a338ab66
11 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

11
compiler/rustc_mir_transform/src/inline.rs
View file

@ -289,7 +289,7 @@ impl<'tcx> Inliner<'tcx> {
) -> Option<CallSite<'tcx>> {
// Only consider direct calls to functions
let terminator = bb_data.terminator();
if let TerminatorKind::Call { ref func, target, .. } = terminator.kind {
if let TerminatorKind::Call { ref func, target, fn_span, .. } = terminator.kind {
let func_ty = func.ty(caller_body, self.tcx);
if let ty::FnDef(def_id, substs) = *func_ty.kind() {
// To resolve an instance its substs have to be fully normalized.
@ -302,14 +302,9 @@ impl<'tcx> Inliner<'tcx> {
}
let fn_sig = self.tcx.bound_fn_sig(def_id).subst(self.tcx, substs);
let source_info = SourceInfo { span: fn_span, ..terminator.source_info };
return Some(CallSite {
callee,
fn_sig,
block: bb,
target,
source_info: terminator.source_info,
});
return Some(CallSite { callee, fn_sig, block: bb, target, source_info });
}
}

1
compiler/rustc_span/src/hygiene.rs
View file

@ -316,6 +316,7 @@ impl ExpnId {
// Stop going up the backtrace once include! is encountered
if expn_data.is_root()
|| expn_data.kind == ExpnKind::Macro(MacroKind::Bang, sym::include)
|| expn_data.kind == ExpnKind::Inlined
{
break;
}