panic_bounds_check: use caller_location, like PanicFnLangItem#69850
Merged
bors merged 4 commits intorust-lang:masterfrom Mar 11, 2020
Merged
panic_bounds_check: use caller_location, like PanicFnLangItem#69850bors merged 4 commits intorust-lang:masterfrom
bors merged 4 commits intorust-lang:masterfrom
Conversation
Contributor
|
r? @KodrAus (rust_highfive has picked a reviewer for you, use r? to override) |
Contributor
|
r? @Centril @bors try @rust-timer queue r=me with clean perf |
Collaborator
|
Awaiting bors try build completion |
Collaborator
bors
added a commit
that referenced
this pull request
Mar 9, 2020
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
reviewed
Mar 9, 2020
Contributor
eddyb
reviewed
Mar 9, 2020
RalfJung
commented
Mar 9, 2020
Collaborator
|
☀️ Try build successful - checks-azure |
Collaborator
|
Queued 568fa7c with parent 2cb0b85, future comparison URL. |
Collaborator
|
Finished benchmarking try commit 568fa7c, comparison URL. |
Member
Author
|
Perf looks like noise to me. |
Contributor
|
r? @eddyb |
eddyb
reviewed
Mar 10, 2020
7489d9c to
0b2329d
Compare
eddyb
approved these changes
Mar 10, 2020
Member
|
@bors r+ |
Collaborator
|
📌 Commit 0b2329d has been approved by |
Collaborator
|
🌲 The tree is currently closed for pull requests below priority 1000, this pull request will be tested once the tree is reopened |
bors
added a commit
that referenced
this pull request
Mar 11, 2020
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
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
8 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The
PanicFnLangItemgot switched to using#[caller_location]at some point, butPanicBoundsCheckFnLangItemwas 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_panicmachine hook never needs to know the currentSpan.