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

Reject borrows of projections in ConstProp. #110954

Merged
merged 2 commits into from
May 5, 2023
Merged

Reject borrows of projections in ConstProp. #110954

merged 2 commits into from
May 5, 2023

Conversation

cjgillot
Copy link
Contributor

Fixes #110947

@rustbot
Copy link
Collaborator

rustbot commented Apr 28, 2023

r? @wesleywiser

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Apr 28, 2023
@rustbot
Copy link
Collaborator

rustbot commented Apr 28, 2023

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

@wesleywiser
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented May 2, 2023

📌 Commit df506f7bacf7674a09b95c9af1a546d3eaa77755 has been approved by wesleywiser

It is now in the queue for this repository.

@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 May 2, 2023
@matthiaskrgr matthiaskrgr mentioned this pull request May 4, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request May 4, 2023
@bors
Auto merge of rust-lang#111210 - matthiaskrgr:rollup-doquh2n, r=matth…
eb7a743 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#108865 (Add a `sysroot` crate to represent the standard library crates)
 - rust-lang#110651 (libtest: include test output in junit xml reports)
 - rust-lang#110826 (Make PlaceMention a non-mutating use.)
 - rust-lang#110982 (Do not recurse into const generic args when resolving self lifetime elision.)
 - rust-lang#111009 (Add `ascii::Char` (ACP#179))
 - rust-lang#111100 (check array type of repeat exprs is wf)
 - rust-lang#111186 (Add `is_positive` method for signed non-zero integers.)
 - rust-lang#111201 (bootstrap: add .gitmodules to the sources)

Failed merges:

 - rust-lang#110954 (Reject borrows of projections in ConstProp.)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors
Copy link
Contributor

bors commented May 4, 2023

☔ The latest upstream changes (presumably #111210) 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 May 4, 2023
@cjgillot
Copy link
Contributor Author

cjgillot commented May 4, 2023

@bors r=wesleywiser

@bors
Copy link
Contributor

bors commented May 4, 2023

📌 Commit 1ffe905 has been approved by wesleywiser

It is now in the queue for this repository.

@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 May 4, 2023
@JohnTitor JohnTitor mentioned this pull request May 5, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request May 5, 2023
@bors
Auto merge of rust-lang#111231 - JohnTitor:rollup-a25ff8v, r=JohnTitor
3320f2f 
Rollup of 8 pull requests

Successful merges:

 - rust-lang#110946 (avoid duplicating TLS state between test std and realstd)
 - rust-lang#110954 (Reject borrows of projections in ConstProp.)
 - rust-lang#111052 (Fix problems with backtraces in two ui tests.)
 - rust-lang#111132 (cleanup nll generalizer)
 - rust-lang#111173 (Still more encoder cleanups)
 - rust-lang#111187 (bootstrap: add llvm-project/runtimes to the sources)
 - rust-lang#111213 (Fixup "since" dates for `array_tuple_conv` feature)
 - rust-lang#111223 (Use `free-args` consistently in bootstrap)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 18d4e22 into rust-lang:master May 5, 2023
@rustbot rustbot added this to the 1.71.0 milestone May 5, 2023
@cjgillot cjgillot deleted the const-prop-ref branch May 5, 2023 10:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JakobDegen JakobDegen JakobDegen approved these changes

@wesleywiser wesleywiser wesleywiser approved these changes

Assignees

@wesleywiser wesleywiser

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
Milestone
1.71.0
Development

Successfully merging this pull request may close these issues.

-Zmir-opt-level=2 misoptimises valid code under Tree Borrows
5 participants
@cjgillot @rustbot @wesleywiser @bors @JakobDegen