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.

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

adjust dangling-int-ptr error message #98860

Merged
merged 1 commit into from
Jul 5, 2022

Conversation

RalfJung
Copy link
Member

@RalfJung RalfJung commented Jul 3, 2022

based on suggestions by @saethlin in rust-lang/miri#2163

Fixes rust-lang/miri#2163

I also did a bit of refactoring on this, so we have a helper method to create a Pointer with None provenance.

@rustbot
Copy link
Collaborator

rustbot commented Jul 3, 2022

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

@rust-highfive
Copy link
Collaborator

r? @davidtwco

(rust-highfive has picked a reviewer for you, use r? to override)

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Jul 3, 2022
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 3, 2022
@RalfJung RalfJung force-pushed the dangling-int-ptr branch from 59efe78 to 583d61f Compare July 3, 2022 20:53
@davidtwco
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jul 4, 2022

📌 Commit 583d61f has been approved by davidtwco

@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 Jul 4, 2022
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Jul 4, 2022
adjust dangling-int-ptr error message

based on suggestions by `@saethlin` in rust-lang/miri#2163

Fixes rust-lang/miri#2163

I also did a bit of refactoring on this, so we have a helper method to create a `Pointer` with `None` provenance.
@Dylan-DPC
Copy link
Member

failed in rollup

@Dylan-DPC
Copy link
Member

@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 Jul 4, 2022
@RalfJung
Copy link
Member Author

RalfJung commented Jul 4, 2022

That's a Miri test failure, which should not block CI?
@bors r+ rollup=never

@bors
Copy link
Contributor

bors commented Jul 4, 2022

📌 Commit 583d61f has been approved by RalfJung

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 4, 2022
@RalfJung
Copy link
Member Author

RalfJung commented Jul 4, 2022

@Dylan-DPC I think you got the wrong PR, the actual failure error is

/checkout/src/test/rustdoc-gui/search-tab-change-title-fn-sig.goml search-tab-change-title-fn-sig... FAILED
Error:  (line 6) Error: The following CSS selector "#titles" was not found: for command `wait-for: "#titles"`

@bors rollup-

@Dylan-DPC
Copy link
Member

uhm right, not sure why it threw those errors in RLA output

@bors
Copy link
Contributor

bors commented Jul 5, 2022

☔ The latest upstream changes (presumably #98910) made this pull request unmergeable. Please resolve the merge conflicts.

@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 Jul 5, 2022
@RalfJung RalfJung force-pushed the dangling-int-ptr branch from 583d61f to 46956f7 Compare July 5, 2022 12:08
@RalfJung
Copy link
Member Author

RalfJung commented Jul 5, 2022

@bors r=davidtwco

@bors
Copy link
Contributor

bors commented Jul 5, 2022

📌 Commit 46956f7 has been approved by davidtwco

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 5, 2022
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Jul 5, 2022
adjust dangling-int-ptr error message

based on suggestions by ``@saethlin`` in rust-lang/miri#2163

Fixes rust-lang/miri#2163

I also did a bit of refactoring on this, so we have a helper method to create a `Pointer` with `None` provenance.
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 5, 2022
…askrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#98860 (adjust dangling-int-ptr error message)
 - rust-lang#98888 (interpret: fix CheckedBinOp behavior when overflow checking is disabled)
 - rust-lang#98889 (Add regression test for rust-lang#79467)
 - rust-lang#98895 (bootstrap.py: Always use `.exe` for Windows)
 - rust-lang#98920 (adapt issue-37945 codegen test to accept any order of ops)
 - rust-lang#98921 (Refactor: remove a redundant mutable variable)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 69195c0 into rust-lang:master Jul 5, 2022
@rustbot rustbot added this to the 1.64.0 milestone Jul 5, 2022
@RalfJung RalfJung deleted the dangling-int-ptr branch July 6, 2022 02:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

What does -Zmiri-disable-validation mean for pointers from transmutes (now?)
6 participants