Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ensure that validity only raises validity errors #69762

Merged
merged 5 commits into from
Mar 9, 2020
Merged

Ensure that validity only raises validity errors #69762

merged 5 commits into from
Mar 9, 2020

Conversation

RalfJung
Copy link
Member

@RalfJung RalfJung commented Mar 6, 2020 •
edited
Loading

For now, only as a debug-assertion (similar to const-prop detecting errors that allocate).

Now includes #69646.
Relative diff.

r? @oli-obk

@RalfJung RalfJung mentioned this pull request Mar 6, 2020
Merged
@RalfJung RalfJung added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 6, 2020
oli-obk
oli-obk requested changes Mar 6, 2020
View reviewed changes
src/librustc/mir/interpret/error.rs Outdated Show resolved Hide resolved
src/librustc/mir/interpret/error.rs Outdated Show resolved Hide resolved
@oli-obk
Copy link
Contributor

oli-obk commented Mar 7, 2020

@bors r+

@bors
Copy link
Contributor

bors commented Mar 7, 2020

📌 Commit b088ef61837b4ee3a407d2e86041574116635b17 has been approved by oli-obk

@bors
Copy link
Contributor

bors commented Mar 7, 2020

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

@bors bors 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 7, 2020
@RalfJung
Copy link
Member Author

RalfJung commented Mar 8, 2020 •
edited
Loading

I rebased this on top of #69646 (as they conflict quite badly).
Relative diff. So let's wait for that one to land first.

@bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 8, 2020
@RalfJung RalfJung added S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 8, 2020
@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. labels Mar 8, 2020
@RalfJung
Copy link
Member Author

RalfJung commented Mar 8, 2020

All right, parent PR landed. Rebased and good to go.
@bors r=oli-obk

@bors
Copy link
Contributor

bors commented Mar 8, 2020

📌 Commit ed3014a has been approved by oli-obk

@bors
Copy link
Contributor

bors commented Mar 8, 2020

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

@bors bors removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Mar 8, 2020
@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Mar 8, 2020
@RalfJung RalfJung mentioned this pull request Mar 8, 2020
Merged
Centril added a commit to Centril/rust that referenced this pull request Mar 9, 2020
@Centril
Rollup merge of rust-lang#69762 - RalfJung:validity-errors, r=oli-obk
867104a 
Ensure that validity only raises validity errors

For now, only as a debug-assertion (similar to const-prop detecting errors that allocate).

Now includes rust-lang#69646.
[Relative diff](RalfJung/rust@layout-visitor...RalfJung:validity-errors).

r? @oli-obk
@Centril Centril mentioned this pull request Mar 9, 2020
Closed
Centril added a commit to Centril/rust that referenced this pull request Mar 9, 2020
@Centril
Rollup merge of rust-lang#69762 - RalfJung:validity-errors, r=oli-obk
e60915c 
Ensure that validity only raises validity errors

For now, only as a debug-assertion (similar to const-prop detecting errors that allocate).

Now includes rust-lang#69646.
[Relative diff](RalfJung/rust@layout-visitor...RalfJung:validity-errors).

r? @oli-obk
@Centril Centril mentioned this pull request Mar 9, 2020
Closed
bors added a commit that referenced this pull request Mar 9, 2020
@bors
Auto merge of #69846 - Centril:rollup-7j2v0dx, r=Centril
1b40570 
Rollup of 6 pull requests

Successful merges:

 - #69201 (Permit attributes on 'if' expressions)
 - #69402 (Extend search)
 - #69519 ( Don't use static crt by default when build proc-macro)
 - #69685 (unix: Don't override existing SIGSEGV/BUS handlers)
 - #69762 (Ensure that validity only raises validity errors)
 - #69779 (librustc_codegen_llvm: Use slices in preference to 0-terminated strings)

Failed merges:

r? @ghost
Centril added a commit to Centril/rust that referenced this pull request Mar 9, 2020
@Centril
Rollup merge of rust-lang#69762 - RalfJung:validity-errors, r=oli-obk
1ae39a5 
Ensure that validity only raises validity errors

For now, only as a debug-assertion (similar to const-prop detecting errors that allocate).

Now includes rust-lang#69646.
[Relative diff](RalfJung/rust@layout-visitor...RalfJung:validity-errors).

r? @oli-obk
@Centril Centril mentioned this pull request Mar 9, 2020
Closed
@Centril Centril mentioned this pull request Mar 9, 2020
Merged
bors added a commit that referenced this pull request Mar 9, 2020
@bors
Auto merge of #69851 - Centril:rollup-iivxvah, r=Centril
3dbade6 
Rollup of 6 pull requests

Successful merges:

 - #69201 (Permit attributes on 'if' expressions)
 - #69685 (unix: Don't override existing SIGSEGV/BUS handlers)
 - #69762 (Ensure that validity only raises validity errors)
 - #69779 (librustc_codegen_llvm: Use slices in preference to 0-terminated strings)
 - #69801 (rustc_parse: Remove `Parser::normalized(_prev)_token`)
 - #69842 (Add more regression tests)

Failed merges:

r? @ghost
@bors bors merged commit c9bbfb9 into rust-lang:master Mar 9, 2020
@RalfJung RalfJung deleted the validity-errors branch March 9, 2020 15:58
bors added a commit to rust-lang/miri that referenced this pull request Mar 9, 2020
@bors
Auto merge of #1210 - RalfJung:rustup-validity, r=RalfJung
676c4f8 
rustup: adjust error message

This is the Miri side of rust-lang/rust#69762
Manishearth added a commit to Manishearth/rust that referenced this pull request Mar 17, 2020
@Manishearth
Rollup merge of rust-lang#69839 - RalfJung:miri-error-cleanup, r=oli-obk
c74d524 
Miri error reform

Some time ago we started moving Miri errors into a few distinct categories, but we never classified all the old errors. That's what this PR does.

~~This is on top of rust-lang#69762; [relative diff](RalfJung/rust@validity-errors...RalfJung:miri-error-cleanup).~~

r? @oli-obk

Fixes rust-lang/const-eval#4
Centril added a commit to Centril/rust that referenced this pull request Mar 18, 2020
@Centril
Rollup merge of rust-lang#69839 - RalfJung:miri-error-cleanup, r=oli-obk
f1af774 
Miri error reform

Some time ago we started moving Miri errors into a few distinct categories, but we never classified all the old errors. That's what this PR does.

~~This is on top of rust-lang#69762; [relative diff](RalfJung/rust@validity-errors...RalfJung:miri-error-cleanup).~~

r? @oli-obk

Fixes rust-lang/const-eval#4
Centril added a commit to Centril/rust that referenced this pull request Mar 18, 2020
@Centril
Rollup merge of rust-lang#69839 - RalfJung:miri-error-cleanup, r=oli-obk
8ab967e 
Miri error reform

Some time ago we started moving Miri errors into a few distinct categories, but we never classified all the old errors. That's what this PR does.

~~This is on top of rust-lang#69762; [relative diff](RalfJung/rust@validity-errors...RalfJung:miri-error-cleanup).~~

r? @oli-obk

Fixes rust-lang/const-eval#4
Centril added a commit to Centril/rust that referenced this pull request Mar 18, 2020
@Centril
Rollup merge of rust-lang#69839 - RalfJung:miri-error-cleanup, r=oli-obk
a958314 
Miri error reform

Some time ago we started moving Miri errors into a few distinct categories, but we never classified all the old errors. That's what this PR does.

~~This is on top of rust-lang#69762; [relative diff](RalfJung/rust@validity-errors...RalfJung:miri-error-cleanup).~~

r? @oli-obk

Fixes rust-lang/const-eval#4
@RalfJung RalfJung mentioned this pull request Apr 22, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bjorn3 bjorn3 bjorn3 left review comments

@oli-obk oli-obk oli-obk requested changes

Assignees

@oli-obk oli-obk

Labels
S-waiting-on-bors Status: 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.
4 participants
@RalfJung @oli-obk @bors @bjorn3