Skip to content

panic_bounds_check: use caller_location, like PanicFnLangItem - #69850

Merged
bors merged 4 commits into
rust-lang:masterfrom
RalfJung:panic-bounds-check
Mar 11, 2020
Merged

panic_bounds_check: use caller_location, like PanicFnLangItem#69850
bors merged 4 commits into
rust-lang:masterfrom
RalfJung:panic-bounds-check

Conversation

@RalfJung

@RalfJungRalfJung commented Mar 9, 2020

Copy link
Copy Markdown
Member

The PanicFnLangItem got switched to using #[caller_location] at some point, but PanicBoundsCheckFnLangItem was kept in the old style. For consistency, switch that one over to use #[caller_location] as well.

This is also helpful for Miri as it means the assert_panic machine hook never needs to know the current Span.

@rust-highfive

rust-highfive commented Mar 9, 2020

Copy link
Copy Markdown
Contributor

r? @KodrAus

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 9, 2020
@CentrilCentril added the F-track_caller `#![feature(track_caller)]` label Mar 9, 2020
@Centril

Centril commented Mar 9, 2020

Copy link
Copy Markdown
Contributor

r? @Centril

@bors try @rust-timer queue

r=me with clean perf

@rust-timer

rust-timer commented Mar 9, 2020

Copy link
Copy Markdown
Collaborator

Awaiting bors try build completion

@rust-highfiverust-highfive assigned Centril and unassigned KodrAusMar 9, 2020
@bors

bors commented Mar 9, 2020

Copy link
Copy Markdown
Collaborator

⌛ Trying commit 1a9fc18 with merge 568fa7c...

bors added a commit that referenced this pull request Mar 9, 2020
@bors
Auto merge of#69850- RalfJung:panic-bounds-check, r=<try>
568fa7c
panic_bounds_check: use caller_location, like PanicFnLangItem
The `PanicFnLangItem` got switched to using `#[caller_location]` at some point, but `PanicBoundsCheckFnLangItem` was kept in the old style. For consistency, switch that one over to use `#[caller_location]` as well.
This is also helpful for Miri as it means the `assert_panic` machine hook never needs to know the current `Span`.
Centril
Centril reviewed Mar 9, 2020
View reviewed changes
Comment threadsrc/librustc_codegen_ssa/mir/block.rs Outdated
@Centril

Centril commented Mar 9, 2020

Copy link
Copy Markdown
Contributor

cc also @eddyb@anp

eddyb
eddyb reviewed Mar 9, 2020
View reviewed changes
Comment threadsrc/libcore/panicking.rs Outdated
RalfJung
RalfJung commented Mar 9, 2020
View reviewed changes
Comment threadsrc/librustc_codegen_ssa/mir/block.rs Outdated
@bors

bors commented Mar 9, 2020

Copy link
Copy Markdown
Collaborator

☀️ Try build successful - checks-azure
Build commit: 568fa7c (568fa7cb76e8cfbf4e2491e846c1baf98ec7a356)

@rust-timer

rust-timer commented Mar 9, 2020

Copy link
Copy Markdown
Collaborator

Queued 568fa7c with parent 2cb0b85, future comparison URL.

@rust-timer

rust-timer commented Mar 9, 2020

Copy link
Copy Markdown
Collaborator

Finished benchmarking try commit 568fa7c, comparison URL.

@RalfJung

RalfJung commented Mar 9, 2020

Copy link
Copy Markdown
MemberAuthor

Perf looks like noise to me.
@eddyb I found a way to add #[track_caller] to panic_fmt as well. It required a bit more cfg(bootstrap) surgery.

@Centril

Centril commented Mar 10, 2020

Copy link
Copy Markdown
Contributor

r? @eddyb

@rust-highfiverust-highfive assigned eddyb and unassigned CentrilMar 10, 2020
eddyb
eddyb reviewed Mar 10, 2020
View reviewed changes
Comment threadsrc/libcore/panicking.rs Outdated
@eddyb

eddyb commented Mar 10, 2020

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Mar 10, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 0b2329d has been approved by eddyb

@bors

bors commented Mar 10, 2020

Copy link
Copy Markdown
Collaborator

🌲 The tree is currently closed for pull requests below priority 1000, this pull request will be tested once the tree is reopened

@borsbors 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 Mar 10, 2020
anp
anp approved these changes Mar 11, 2020
View reviewed changes

@anpanp left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice!

@CentrilCentril mentioned this pull request Mar 11, 2020
Merged
bors added a commit that referenced this pull request Mar 11, 2020
@bors
Auto merge of#69919- Centril:rollup-fxo33zs, r=Centril
c20d7ee
Rollup of 8 pull requests
Successful merges:
- #66472 (--show-coverage json)
- #69603 (tidy: replace `make check` with `./x.py test` in documentation)
- #69760 (Improve expression & attribute parsing)
- #69828 (fix memory leak when vec::IntoIter panics during drop)
- #69850 (panic_bounds_check: use caller_location, like PanicFnLangItem)
- #69876 (Add long error explanation for E0739)
- #69888 ([Miri] Use a session variable instead of checking for an env var always)
- #69893 (librustc_codegen_llvm: Use slices instead of 0-terminated strings)
Failed merges:
r? @ghost
@bors
bors merged commit 3853da7 into rust-lang:masterMar 11, 2020
@RalfJung
RalfJung deleted the panic-bounds-check branch March 11, 2020 19:05
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

3 more reviewers
@CentrilCentrilCentril left review comments
@eddybeddybeddyb approved these changes
@anpanpanp approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@eddybeddyb

Labels

F-track_caller`#![feature(track_caller)]`S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@RalfJung@rust-highfive@Centril@rust-timer@bors@eddyb@anp@KodrAus