CTFE inbounds-error-messages tweak #84972
Merged
Conversation
This file contains 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
rust-highfive
added
the
S-waiting-on-review
RalfJung
commented
May 6, 2021
| @@ -306,6 +306,9 @@ impl fmt::Display for UndefinedBehaviorInfo<'_> { | |||
| ptr.alloc_id, | |||
| allocation_size.bytes() | |||
| ), | |||
| DanglingIntPointer(_, CheckInAllocMsg::InboundsTest) => { | |||
| write!(f, "null pointer is not allowed for this operation") | |||
| } | |||
There was a problem hiding this comment.
This special printing case existed before but at some point turned into dead code which was removed in #84903 -- but the code is good, it just should not be dead. :)
This comment has been minimized.
This comment has been minimized.
oli-obk
reviewed
May 6, 2021
| @@ -296,7 +296,7 @@ error[E0080]: could not evaluate static initializer | |||
| --> $DIR/ub-wide-ptr.rs:135:5 | |||
| | | |||
| LL | mem::transmute::<_, &dyn Trait>((&92u8, 0usize)) | |||
| | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ inbounds test failed: 0x0 is not a valid pointer | |||
| | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ null pointer is not allowed for this operation | |||
There was a problem hiding this comment.
I wish we had more info here, like that this is about a vtable ptr in a wide pointer... but not sure what needs to be done for that. Orthogonal to this PR in any case
|
@bors r+ rollup |
|
📌 Commit bcf622b has been approved by |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 7, 2021
Rollup of 9 pull requests Successful merges: - rust-lang#84779 (Add support for --test-args to cargotest) - rust-lang#84781 (Don't check bootstrap artifacts by default) - rust-lang#84787 (bump deps) - rust-lang#84815 (Update coverage docs and command line help) - rust-lang#84875 (Removes unneeded check of `#[no_coverage]` in mapgen) - rust-lang#84897 (Coverage instruments closure bodies in macros (not the macro body)) - rust-lang#84911 (Retry clang+llvm download) - rust-lang#84972 (CTFE inbounds-error-messages tweak) - rust-lang#84990 (Sort rustdoc-gui tests) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
ghost
mentioned this pull request
Dylan-DPC-zz
pushed a commit
to Dylan-DPC-zz/rust
that referenced
this pull request
May 7, 2021
fix null pointer error messages I got the `match` in rust-lang#84972 wrong, this fixes that. Also avoid redundant "inbounds test failed:" prefix. Should fix rust-lang#85027 r? `@oli-obk`
Dylan-DPC-zz
pushed a commit
to Dylan-DPC-zz/rust
that referenced
this pull request
May 7, 2021
fix null pointer error messages I got the `match` in rust-lang#84972 wrong, this fixes that. Also avoid redundant "inbounds test failed:" prefix. Should fix rust-lang#85027 r? `@oli-obk`
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
r? @oli-obk