Add support to caller_location to rustc_public by celinval · Pull Request #159204 · rust-lang/rust

celinval · 2026-07-13T05:03:17Z

This PR has two small commits that add APIs to help handle caller location.

Instance::requires_caller_location
Span::as_caller_location

Fixes rust-lang/rustc_public#62
Fixes rust-lang/rustc_public#123

disclaimer: I used AI to help me write this code.

Expose the internal `requires_caller_location` query through rustc_public so tools can detect when an instance has an implicit extra `&'static Location<'static>` argument in its ABI that is not present in the MIR body signature. Fixes rust-lang/rustc_public#123

Add an API to construct the `&'static Location<'static>` constant that must be passed as the implicit extra argument when calling a `#[track_caller]` function. Users provide the span of the call site (or the callee's definition span for reify shim fallback). Fixes rust-lang/rustc_public#62

rustbot · 2026-07-13T05:03:21Z

This PR changes rustc_public

cc @oli-obk, @ouz-a, @makai410

makai410

Thanks! LGTM, just one suggestion. r=me if you prefer to do it as a follow-up.

View changes since this review

makai410 · 2026-07-16T15:11:25Z

+                let call_span = bb.terminator.source_info.span;
+                let location_const = call_span.as_caller_location();


What if there are inlined functions? I think it would be handy if we provide a method like get_caller_location() somewhere that handles the scenario when there are inlined functions. FWIW, there is a caller_location_span() that can make our lives easier.

That's a great call out. We actually don't even need span.as_caller_location() to be public. The only caveat, is that rustc_public doesn't have all the information to make the bridge to the internal caller_location_span(), so we'll need to duplicate the logic from that function. It's fairly straight forward tho, so let me update this PR.

Add a method Body::caller_location that resolves the correct caller location constant for a call to a #[track_caller] function, walking inlined source scopes to handle MIR inlining correctly. Body now stores source scope data as a public field. Body::new populates it with empty entries (no inlining info); bodies obtained from the compiler have full scope data populated. Span::as_caller_location is now pub(crate) since users should use Body::caller_location instead, which handles inlining correctly.

celinval · 2026-07-22T17:55:40Z

@makai410 I was wondering if you want to take a look at the latest changes before I merge this since they weren't trivial. Thanks!

makai410

Sorry for the slow response.

One thing that can be done later is adding visit_source_scope to MirVisitor if there's any request for it. This is looking good. Thanks!

@bors r+ rollup

View changes since this review

rust-bors · 2026-07-25T13:43:18Z

📌 Commit 5c88a1c has been approved by makai410

It is now in the queue for this repository.

@makai410

…akai410 Add support to caller_location to rustc_public This PR has two small commits that add APIs to help handle caller location. 1. `Instance::requires_caller_location` 2. `Span::as_caller_location` Fixes rust-lang/rustc_public#62 Fixes rust-lang/rustc_public#123 r? @makai410 disclaimer: I used AI to help me write this code.

Rollup of 23 pull requests Successful merges: - #159720 (document #[global_allocator] constraints) - #159732 (optimization: don't look for diagnostic/canonical items without rustc_attrs enabled) - #159738 (implement `CovariantUnsafeCell`) - #159740 (reuse regular exported_non_generic_symbols logic in Miri) - #159780 (check `extern "custom"` function pointers) - #159786 (rustdoc-js: ignore editor temp files in test folder discovery) - #159819 (std::sync::poison: disable auto_cfg on PoisonError::new) - #155388 (stepping into where-clauses during normalization may be productive) - #155914 (when bailing on ambiguity, don't force other results to ambig) - #159204 (Add support to caller_location to rustc_public) - #159411 ([rustdoc] Correctly handle output options with --show-coverage) - #159439 (Fix(lib/fs/win): Fall back on Win32 delete for `Dir::remove_file`) - #159676 (Update wasm-component-ld to 0.5.27) - #159730 (allow accessing the contents of UnsafeCell without going through get) - #159809 (Avoid `#[target_features]`) - #159810 (Add tuple never coercion collection regression test) - #159826 (Remove redundant `#[rustc_paren_sugar]` feature gate) - #159853 (Updated expect messages for `CString` struct and method documentation) - #159877 (Revert "Export `derive` at `core::derive` and `std::derive`") - #159878 (bootstrap: Remove obsolete option `build.compiletest-use-stage0-libtest`) - #159882 (Update expect messages in library/alloc/boxed.rs and library/alloc/string.rs to follow the style guide) - #159891 (Split multiline derives into std/rustc macros) - #159895 (rustc-dev-guide subtree update)

@makai410

…akai410 Add support to caller_location to rustc_public This PR has two small commits that add APIs to help handle caller location. 1. `Instance::requires_caller_location` 2. `Span::as_caller_location` Fixes rust-lang/rustc_public#62 Fixes rust-lang/rustc_public#123 r? @makai410 disclaimer: I used AI to help me write this code.

Rollup of 23 pull requests Successful merges: - #159673 (bootstrap: forward -fdebug-prefix-map when using cc) - #159720 (document #[global_allocator] constraints) - #159732 (optimization: don't look for diagnostic/canonical items without rustc_attrs enabled) - #159738 (implement `CovariantUnsafeCell`) - #159740 (reuse regular exported_non_generic_symbols logic in Miri) - #159780 (check `extern "custom"` function pointers) - #159786 (rustdoc-js: ignore editor temp files in test folder discovery) - #159819 (std::sync::poison: disable auto_cfg on PoisonError::new) - #155388 (stepping into where-clauses during normalization may be productive) - #155914 (when bailing on ambiguity, don't force other results to ambig) - #159204 (Add support to caller_location to rustc_public) - #159411 ([rustdoc] Correctly handle output options with --show-coverage) - #159439 (Fix(lib/fs/win): Fall back on Win32 delete for `Dir::remove_file`) - #159676 (Update wasm-component-ld to 0.5.27) - #159730 (allow accessing the contents of UnsafeCell without going through get) - #159809 (Avoid `#[target_features]`) - #159810 (Add tuple never coercion collection regression test) - #159826 (Remove redundant `#[rustc_paren_sugar]` feature gate) - #159853 (Updated expect messages for `CString` struct and method documentation) - #159878 (bootstrap: Remove obsolete option `build.compiletest-use-stage0-libtest`) - #159882 (Update expect messages in library/alloc/boxed.rs and library/alloc/string.rs to follow the style guide) - #159891 (Split multiline derives into std/rustc macros) - #159895 (rustc-dev-guide subtree update)

@makai410

…akai410 Add support to caller_location to rustc_public This PR has two small commits that add APIs to help handle caller location. 1. `Instance::requires_caller_location` 2. `Span::as_caller_location` Fixes rust-lang/rustc_public#62 Fixes rust-lang/rustc_public#123 r? @makai410 disclaimer: I used AI to help me write this code.

…uwer Rollup of 25 pull requests Successful merges: - #138618 (Support using const pointers in asm `const` operand) - #157962 (Lower paths to functions in const args as ConstKind::Error) - #158404 (trait_solver: normalize next-gen region constraints) - #158709 (rustdoc: warn on improperly interleaved HTML/MD) - #159174 (Fix implicit_provenance_casts warnings on Xous) - #159179 (enable `unreachable_cfg_select_predicates` lint as part of `unused` lint group) - #159518 (iter: extend step_by specialization to cover StepBy<RangeIter<{integer}>>) - #159673 (bootstrap: forward -fdebug-prefix-map when using cc) - #159700 (Split non-local `semicolon_in_expressions_from_macros` into a separate lint) - #159720 (document #[global_allocator] constraints) - #159732 (optimization: don't look for diagnostic/canonical items without rustc_attrs enabled) - #159738 (implement `CovariantUnsafeCell`) - #159740 (reuse regular exported_non_generic_symbols logic in Miri) - #159780 (check `extern "custom"` function pointers) - #159785 (Share _Unwind_Exception definition between native and wasm) - #159786 (rustdoc-js: ignore editor temp files in test folder discovery) - #159819 (std::sync::poison: disable auto_cfg on PoisonError::new) - #155388 (stepping into where-clauses during normalization may be productive) - #155914 (when bailing on ambiguity, don't force other results to ambig) - #159204 (Add support to caller_location to rustc_public) - #159439 (Fix(lib/fs/win): Fall back on Win32 delete for `Dir::remove_file`) - #159676 (Update wasm-component-ld to 0.5.27) - #159695 (proc_macro: Fix cfg_attr inner attrs in file modules) - #159730 (allow accessing the contents of UnsafeCell without going through get) - #159809 (Avoid `#[target_features]`)

@makai410

…akai410 Add support to caller_location to rustc_public This PR has two small commits that add APIs to help handle caller location. 1. `Instance::requires_caller_location` 2. `Span::as_caller_location` Fixes rust-lang/rustc_public#62 Fixes rust-lang/rustc_public#123 r? @makai410 disclaimer: I used AI to help me write this code.

…uwer Rollup of 25 pull requests Successful merges: - #159825 (codegen: handle OperandValue::Uninit in codegen_return_terminator) - #138618 (Support using const pointers in asm `const` operand) - #157962 (Lower paths to functions in const args as ConstKind::Error) - #158404 (trait_solver: normalize next-gen region constraints) - #158709 (rustdoc: warn on improperly interleaved HTML/MD) - #159174 (Fix implicit_provenance_casts warnings on Xous) - #159179 (enable `unreachable_cfg_select_predicates` lint as part of `unused` lint group) - #159518 (iter: extend step_by specialization to cover StepBy<RangeIter<{integer}>>) - #159673 (bootstrap: forward -fdebug-prefix-map when using cc) - #159700 (Split non-local `semicolon_in_expressions_from_macros` into a separate lint) - #159720 (document #[global_allocator] constraints) - #159732 (optimization: don't look for diagnostic/canonical items without rustc_attrs enabled) - #159738 (implement `CovariantUnsafeCell`) - #159740 (reuse regular exported_non_generic_symbols logic in Miri) - #159780 (check `extern "custom"` function pointers) - #159786 (rustdoc-js: ignore editor temp files in test folder discovery) - #159819 (std::sync::poison: disable auto_cfg on PoisonError::new) - #155388 (stepping into where-clauses during normalization may be productive) - #155914 (when bailing on ambiguity, don't force other results to ambig) - #159204 (Add support to caller_location to rustc_public) - #159439 (Fix(lib/fs/win): Fall back on Win32 delete for `Dir::remove_file`) - #159676 (Update wasm-component-ld to 0.5.27) - #159695 (proc_macro: Fix cfg_attr inner attrs in file modules) - #159730 (allow accessing the contents of UnsafeCell without going through get) - #159809 (Avoid `#[target_features]`)

@makai410

…akai410 Add support to caller_location to rustc_public This PR has two small commits that add APIs to help handle caller location. 1. `Instance::requires_caller_location` 2. `Span::as_caller_location` Fixes rust-lang/rustc_public#62 Fixes rust-lang/rustc_public#123 r? @makai410 disclaimer: I used AI to help me write this code.

Rollup of 25 pull requests Successful merges: - #138618 (Support using const pointers in asm `const` operand) - #157962 (Lower paths to functions in const args as ConstKind::Error) - #158709 (rustdoc: warn on improperly interleaved HTML/MD) - #159174 (Fix implicit_provenance_casts warnings on Xous) - #159179 (enable `unreachable_cfg_select_predicates` lint as part of `unused` lint group) - #159518 (iter: extend step_by specialization to cover StepBy<RangeIter<{integer}>>) - #159673 (bootstrap: forward -fdebug-prefix-map when using cc) - #159700 (Split non-local `semicolon_in_expressions_from_macros` into a separate lint) - #159720 (document #[global_allocator] constraints) - #159732 (optimization: don't look for diagnostic/canonical items without rustc_attrs enabled) - #159738 (implement `CovariantUnsafeCell`) - #159740 (reuse regular exported_non_generic_symbols logic in Miri) - #159780 (check `extern "custom"` function pointers) - #159786 (rustdoc-js: ignore editor temp files in test folder discovery) - #159819 (std::sync::poison: disable auto_cfg on PoisonError::new) - #152439 (Fix typos and grammar in library documentation) - #155388 (stepping into where-clauses during normalization may be productive) - #155914 (when bailing on ambiguity, don't force other results to ambig) - #159204 (Add support to caller_location to rustc_public) - #159439 (Fix(lib/fs/win): Fall back on Win32 delete for `Dir::remove_file`) - #159676 (Update wasm-component-ld to 0.5.27) - #159695 (proc_macro: Fix cfg_attr inner attrs in file modules) - #159730 (allow accessing the contents of UnsafeCell without going through get) - #159809 (Avoid `#[target_features]`) - #159878 (bootstrap: Remove obsolete option `build.compiletest-use-stage0-libtest`)

@makai410

Rollup merge of #159204 - celinval:feat/caller_location, r=makai410 Add support to caller_location to rustc_public This PR has two small commits that add APIs to help handle caller location. 1. `Instance::requires_caller_location` 2. `Span::as_caller_location` Fixes rust-lang/rustc_public#62 Fixes rust-lang/rustc_public#123 r? @makai410 disclaimer: I used AI to help me write this code.

celinval added 2 commits July 13, 2026 04:53

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jul 13, 2026

rustbot assigned makai410 Jul 13, 2026

makai410 approved these changes Jul 16, 2026

View reviewed changes

celinval force-pushed the feat/caller_location branch from eff9c3e to 5c88a1c Compare July 17, 2026 21:24

celinval mentioned this pull request Jul 22, 2026

Handle new caller_location intrinsic the right way model-checking/kani#374

Open

makai410 reviewed Jul 25, 2026

View reviewed changes

rust-bors Bot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 25, 2026

GuillaumeGomez mentioned this pull request Jul 25, 2026

Rollup of 23 pull requests #159903

Closed

GuillaumeGomez mentioned this pull request Jul 25, 2026

Rollup of 23 pull requests #159905

Closed

JonathanBrouwer mentioned this pull request Jul 25, 2026

Rollup of 25 pull requests #159920

Closed

JonathanBrouwer mentioned this pull request Jul 25, 2026

Rollup of 25 pull requests #159926

Closed

This was referenced Jul 26, 2026

Rollup of 25 pull requests #159941

Closed

Rollup of 25 pull requests #159942

Merged

rust-bors Bot merged commit f41072c into rust-lang:main Jul 26, 2026
13 checks passed

rustbot added this to the 1.99.0 milestone Jul 26, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Add support to caller_location to rustc_public#159204

Add support to caller_location to rustc_public#159204
rust-bors[bot] merged 3 commits into
rust-lang:mainfrom
celinval:feat/caller_location

celinval commented Jul 13, 2026 •

edited

Loading

Uh oh!

rustbot commented Jul 13, 2026

Uh oh!

makai410 left a comment •

edited by rustbot

Loading

Uh oh!

makai410 Jul 16, 2026

Uh oh!

celinval Jul 16, 2026

Uh oh!

celinval commented Jul 22, 2026

Uh oh!

makai410 left a comment •

edited by rustbot

Loading

Uh oh!

rust-bors Bot commented Jul 25, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

		let call_span = bb.terminator.source_info.span;
		let location_const = call_span.as_caller_location();

Uh oh!

Uh oh!

Conversation

celinval commented Jul 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Jul 13, 2026

Uh oh!

makai410 left a comment • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

makai410 Jul 16, 2026

Choose a reason for hiding this comment

Uh oh!

celinval Jul 16, 2026

Choose a reason for hiding this comment

Uh oh!

celinval commented Jul 22, 2026

Uh oh!

makai410 left a comment • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

rust-bors Bot commented Jul 25, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

celinval commented Jul 13, 2026 •

edited

Loading

makai410 left a comment •

edited by rustbot

Loading

makai410 left a comment •

edited by rustbot

Loading