Skip to content

Commit 04fa124

Browse files
RalfJungRalfJung
committed
share the track_caller handling within a mir::Body
1 parent 351d532 commit 04fa124

File tree

4 files changed

+54
-93
lines changed

4 files changed

+54
-93
lines changed

‎compiler/rustc_codegen_cranelift/src/common.rs

+5-32
Original file line numberDiff line numberDiff line change
@@ -430,38 +430,11 @@ impl<'tcx> FunctionCx<'_, '_, 'tcx> {
430430
}
431431
}
432432

433-
// Note: must be kept in sync with get_caller_location from cg_ssa
434-
pub(crate) fn get_caller_location(&mut self, mut source_info: mir::SourceInfo) -> CValue<'tcx> {
435-
let span_to_caller_location = |fx: &mut FunctionCx<'_, '_, 'tcx>, span: Span| {
436-
let const_loc = fx.tcx.span_as_caller_location(span);
437-
crate::constant::codegen_const_value(fx, const_loc, fx.tcx.caller_location_ty())
438-
};
439-
440-
// Walk up the `SourceScope`s, in case some of them are from MIR inlining.
441-
// If so, the starting `source_info.span` is in the innermost inlined
442-
// function, and will be replaced with outer callsite spans as long
443-
// as the inlined functions were `#[track_caller]`.
444-
loop {
445-
let scope_data = &self.mir.source_scopes[source_info.scope];
446-
447-
if let Some((callee, callsite_span)) = scope_data.inlined {
448-
// Stop inside the most nested non-`#[track_caller]` function,
449-
// before ever reaching its caller (which is irrelevant).
450-
if !callee.def.requires_caller_location(self.tcx) {
451-
return span_to_caller_location(self, source_info.span);
452-
}
453-
source_info.span = callsite_span;
454-
}
455-
456-
// Skip past all of the parents with `inlined: None`.
457-
match scope_data.inlined_parent_scope {
458-
Some(parent) => source_info.scope = parent,
459-
None => break,
460-
}
461-
}
462-
463-
// No inlined `SourceScope`s, or all of them were `#[track_caller]`.
464-
self.caller_location.unwrap_or_else(|| span_to_caller_location(self, source_info.span))
433+
pub(crate) fn get_caller_location(&mut self, source_info: mir::SourceInfo) -> CValue<'tcx> {
434+
self.mir.caller_location_span(source_info, self.caller_location, self.tcx, |span| {
435+
let const_loc = self.tcx.span_as_caller_location(span);
436+
crate::constant::codegen_const_value(self, const_loc, self.tcx.caller_location_ty())
437+
})
465438
}
466439

467440
pub(crate) fn anonymous_str(&mut self, msg: &str) -> Value {

‎compiler/rustc_codegen_ssa/src/mir/block.rs

+4-32
Original file line numberDiff line numberDiff line change
@@ -1449,40 +1449,12 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
14491449
fn get_caller_location(
14501450
&mut self,
14511451
bx: &mut Bx,
1452-
mut source_info: mir::SourceInfo,
1452+
source_info: mir::SourceInfo,
14531453
) -> OperandRef<'tcx, Bx::Value> {
1454-
let tcx = bx.tcx();
1455-
1456-
let mut span_to_caller_location = |span: Span| {
1457-
let const_loc = tcx.span_as_caller_location(span);
1454+
self.mir.caller_location_span(source_info, self.caller_location, bx.tcx(), |span: Span| {
1455+
let const_loc = bx.tcx().span_as_caller_location(span);
14581456
OperandRef::from_const(bx, const_loc, bx.tcx().caller_location_ty())
1459-
};
1460-
1461-
// Walk up the `SourceScope`s, in case some of them are from MIR inlining.
1462-
// If so, the starting `source_info.span` is in the innermost inlined
1463-
// function, and will be replaced with outer callsite spans as long
1464-
// as the inlined functions were `#[track_caller]`.
1465-
loop {
1466-
let scope_data = &self.mir.source_scopes[source_info.scope];
1467-
1468-
if let Some((callee, callsite_span)) = scope_data.inlined {
1469-
// Stop inside the most nested non-`#[track_caller]` function,
1470-
// before ever reaching its caller (which is irrelevant).
1471-
if !callee.def.requires_caller_location(tcx) {
1472-
return span_to_caller_location(source_info.span);
1473-
}
1474-
source_info.span = callsite_span;
1475-
}
1476-
1477-
// Skip past all of the parents with `inlined: None`.
1478-
match scope_data.inlined_parent_scope {
1479-
Some(parent) => source_info.scope = parent,
1480-
None => break,
1481-
}
1482-
}
1483-
1484-
// No inlined `SourceScope`s, or all of them were `#[track_caller]`.
1485-
self.caller_location.unwrap_or_else(|| span_to_caller_location(source_info.span))
1457+
})
14861458
}
14871459

14881460
fn get_personality_slot(&mut self, bx: &mut Bx) -> PlaceRef<'tcx, Bx::Value> {

‎compiler/rustc_const_eval/src/interpret/eval_context.rs

+11-29
Original file line numberDiff line numberDiff line change
@@ -622,35 +622,17 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
622622
}
623623
}
624624

625-
// Note: this must be kept in sync with get_caller_location from cg_ssa.
626-
627-
// Walk up the `SourceScope`s, in case some of them are from MIR inlining.
628-
// If so, the starting `source_info.span` is in the innermost inlined
629-
// function, and will be replaced with outer callsite spans as long
630-
// as the inlined functions were `#[track_caller]`.
631-
loop {
632-
let scope_data = &frame.body.source_scopes[source_info.scope];
633-
634-
if let Some((callee, callsite_span)) = scope_data.inlined {
635-
// Stop inside the most nested non-`#[track_caller]` function,
636-
// before ever reaching its caller (which is irrelevant).
637-
if !callee.def.requires_caller_location(*self.tcx) {
638-
return source_info.span;
639-
}
640-
source_info.span = callsite_span;
641-
}
642-
643-
// Skip past all of the parents with `inlined: None`.
644-
match scope_data.inlined_parent_scope {
645-
Some(parent) => source_info.scope = parent,
646-
None => break,
647-
}
648-
}
649-
650-
// Stop inside the most nested non-`#[track_caller]` function,
651-
// before ever reaching its caller (which is irrelevant).
652-
if !frame.instance.def.requires_caller_location(*self.tcx) {
653-
return source_info.span;
625+
let caller_location = if frame.instance.def.requires_caller_location(*self.tcx) {
626+
// We use `Err(())` as indication that we should continue up the call stack since
627+
// this is a `#[track_caller]` function.
628+
Some(Err(()))
629+
} else {
630+
None
631+
};
632+
if let Ok(span) =
633+
frame.body.caller_location_span(source_info, caller_location, *self.tcx, Ok)
634+
{
635+
return span;
654636
}
655637
}
656638

‎compiler/rustc_middle/src/mir/mod.rs

+34
Original file line numberDiff line numberDiff line change
@@ -578,6 +578,40 @@ impl<'tcx> Body<'tcx> {
578578
pub fn is_custom_mir(&self) -> bool {
579579
self.injection_phase.is_some()
580580
}
581+
582+
/// For a `Location` in this scope, determine what the "caller location" at that point is. This
583+
/// is interesting because of inlining: the `#[track_caller]` attribute of inlined functions
584+
/// must be honored. Falls back to the `tracked_caller` value for `#[track_caller]` functions,
585+
/// or the function's scope.
586+
pub fn caller_location_span<T>(
587+
&self,
588+
mut source_info: SourceInfo,
589+
caller_location: Option<T>,
590+
tcx: TyCtxt<'tcx>,
591+
from_span: impl FnOnce(Span) -> T,
592+
) -> T {
593+
loop {
594+
let scope_data = &self.source_scopes[source_info.scope];
595+
596+
if let Some((callee, callsite_span)) = scope_data.inlined {
597+
// Stop inside the most nested non-`#[track_caller]` function,
598+
// before ever reaching its caller (which is irrelevant).
599+
if !callee.def.requires_caller_location(tcx) {
600+
return from_span(source_info.span);
601+
}
602+
source_info.span = callsite_span;
603+
}
604+
605+
// Skip past all of the parents with `inlined: None`.
606+
match scope_data.inlined_parent_scope {
607+
Some(parent) => source_info.scope = parent,
608+
None => break,
609+
}
610+
}
611+
612+
// No inlined `SourceScope`s, or all of them were `#[track_caller]`.
613+
caller_location.unwrap_or_else(|| from_span(source_info.span))
614+
}
581615
}
582616

583617
#[derive(Copy, Clone, PartialEq, Eq, Debug, TyEncodable, TyDecodable, HashStable)]

0 commit comments

Comments
 (0)