miri enum discriminant handling: Fix treatment of pointers, better error when it is undef#55894
Merged
bors merged 3 commits intorust-lang:masterfrom Nov 19, 2018
Merged
Conversation
rust-highfive
added
the
S-waiting-on-review
oli-obk
reviewed
Nov 12, 2018
src/librustc_mir/interpret/memory.rs
Outdated
Contributor
There was a problem hiding this comment.
This is unrelated to this PR, but I don't think we have a test for the overflow behaviour here.
Member
Author
There was a problem hiding this comment.
miri tests some things related to ptr overflow, not sure if it tests this. Also I do not have a good idea for how to test this in a platform-independent way.
But ptr.offset certainly fails on overflow. If rustc had unit tests, we'd just let them cover that...
Member
Author
|
@bors r=oli-obk |
Collaborator
|
📌 Commit c33afac035953dc8826c118c2c6b370f03d7d989 has been approved by |
bors
added
S-waiting-on-bors
This comment has been minimized.
This comment has been minimized.
Member
Author
|
Fixed tests. |
Collaborator
|
📌 Commit b17f96ff27e2c032089f829e439c0685420b1720 has been approved by |
Collaborator
|
☔ The latest upstream changes (presumably #55589) made this pull request unmergeable. Please resolve the merge conflicts. |
bors
added
S-waiting-on-author
RalfJung
force-pushed
the
validation-enums
branch
from
b17f96f to
b8915f2
Compare
Member
Author
|
Rebased. @bors r=oli-obk |
Collaborator
|
📌 Commit b8915f2 has been approved by |
bors
added
S-waiting-on-bors
emilyalbini
added a commit
to emilyalbini/rust
that referenced
this pull request
Nov 16, 2018
miri enum discriminant handling: Fix treatment of pointers, better error when it is undef r? @oli-obk
emilyalbini
added a commit
to emilyalbini/rust
that referenced
this pull request
Nov 18, 2018
miri enum discriminant handling: Fix treatment of pointers, better error when it is undef r? @oli-obk
bors
added a commit
that referenced
this pull request
Nov 19, 2018
Rollup of 25 pull requests Successful merges: - #55562 (Add powerpc- and powerpc64-unknown-linux-musl targets) - #55564 (test/linkage-visibility: Ignore on musl targets) - #55827 (A few tweaks to iterations/collecting) - #55834 (Forward the ABI of the non-zero sized fields of an union if they have the same ABI) - #55857 (remove unused dependency) - #55862 (in which the E0618 "expected function" diagnostic gets a makeover) - #55867 (do not panic just because cargo failed) - #55894 (miri enum discriminant handling: Fix treatment of pointers, better error when it is undef) - #55916 (Make miri value visitor usfeful for mutation) - #55919 (core/tests/num: Simplify `test_int_from_str_overflow()` test code) - #55923 (reword #[test] attribute error on fn items) - #55935 (appveyor: Use VS2017 for all our images) - #55949 (ty: return impl Iterator from Predicate::walk_tys) - #55952 (Update to Clang 7 on CI.) - #55953 (#53488 Refactoring UpvarId) - #55962 (rustdoc: properly calculate spans for intra-doc link resolution errors) - #55963 (Stress test for MPSC) - #55968 (Clean up some non-mod-rs stuff.) - #55970 (Miri backtrace improvements) - #56007 (CTFE: dynamically make sure we do not call non-const-fn) - #56011 (Replace data.clone() by Arc::clone(&data) in mutex doc.) - #56012 (avoid shared ref in UnsafeCell::get) - #56016 (Add VecDeque::resize_with) - #56027 (docs: Add missing backtick in object_safety.rs docs) - #56043 (remove "approx env bounds" if we already know from trait) Failed merges: r? @ghost
bors
added a commit
that referenced
this pull request
Nov 19, 2018
Rollup of 25 pull requests Successful merges: - #55562 (Add powerpc- and powerpc64-unknown-linux-musl targets) - #55564 (test/linkage-visibility: Ignore on musl targets) - #55827 (A few tweaks to iterations/collecting) - #55834 (Forward the ABI of the non-zero sized fields of an union if they have the same ABI) - #55857 (remove unused dependency) - #55862 (in which the E0618 "expected function" diagnostic gets a makeover) - #55867 (do not panic just because cargo failed) - #55894 (miri enum discriminant handling: Fix treatment of pointers, better error when it is undef) - #55916 (Make miri value visitor useful for mutation) - #55919 (core/tests/num: Simplify `test_int_from_str_overflow()` test code) - #55923 (reword #[test] attribute error on fn items) - #55949 (ty: return impl Iterator from Predicate::walk_tys) - #55952 (Update to Clang 7 on CI.) - #55953 (#53488 Refactoring UpvarId) - #55962 (rustdoc: properly calculate spans for intra-doc link resolution errors) - #55963 (Stress test for MPSC) - #55968 (Clean up some non-mod-rs stuff.) - #55970 (Miri backtrace improvements) - #56007 (CTFE: dynamically make sure we do not call non-const-fn) - #56011 (Replace data.clone() by Arc::clone(&data) in mutex doc.) - #56012 (avoid shared ref in UnsafeCell::get) - #56016 (Add VecDeque::resize_with) - #56027 (docs: Add missing backtick in object_safety.rs docs) - #56043 (remove "approx env bounds" if we already know from trait) - #56059 (Increase `Duration` approximate equal threshold to 1us)
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
4 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.
r? @oli-obk