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

normalize field projection ty to fix broken MIR issue #71488

Merged
merged 1 commit into from
Apr 28, 2020

Conversation

spastorino
Copy link
Member

Fixes #71344

r? @eddyb

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 23, 2020
@@ -686,6 +686,7 @@ impl<'a, 'b, 'tcx> TypeVerifier<'a, 'b, 'tcx> {
let fty = self.sanitize_type(place, fty);
match self.field_ty(place, base, field, location) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is field_ty used in more places? Do those places normalize too? Maybe it would be good to normalize inside field_ty itself.

Copy link
Member Author

@spastorino spastorino Apr 27, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That seems to be the only call to that field_ty. There's another call with normalization that happens here but that calls this field_ty.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

btw, I can move both normalize calls inside field_ty if you prefer.

@eddyb
Copy link
Member

eddyb commented Apr 27, 2020

@bors r+

@bors
Copy link
Contributor

bors commented Apr 27, 2020

📌 Commit 7bafb57 has been approved by eddyb

@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 Apr 27, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 28, 2020
Rollup of 5 pull requests

Successful merges:

 - rust-lang#71311 (On `FnDef` type annotation suggestion, use fn-pointer output)
 - rust-lang#71488 (normalize field projection ty to fix broken MIR issue)
 - rust-lang#71489 (Fix off by one in treat err as bug)
 - rust-lang#71585 (remove obsolete comment)
 - rust-lang#71634 (Revert rust-lang#71372 ("Fix #! (shebang) stripping account space issue").)

Failed merges:

r? @ghost
@bors bors merged commit 5aebbe9 into rust-lang:master Apr 28, 2020
@LeSeulArtichaut LeSeulArtichaut added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Apr 29, 2020
@spastorino spastorino added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Apr 29, 2020
@pnkfelix
Copy link
Member

pnkfelix commented May 1, 2020

(deleted comment that was posted on incorrect issue)

@pnkfelix pnkfelix added beta-accepted Accepted for backporting to the compiler in the beta channel. I-nominated labels May 1, 2020
@pnkfelix
Copy link
Member

pnkfelix commented May 1, 2020

(OMG I posted on the wrong issue)

@pnkfelix pnkfelix removed I-nominated beta-accepted Accepted for backporting to the compiler in the beta channel. labels May 1, 2020
@pnkfelix
Copy link
Member

pnkfelix commented May 1, 2020

discussed at this week's T-compiler meeting

beta-accepted

@pnkfelix pnkfelix added the beta-accepted Accepted for backporting to the compiler in the beta channel. label May 1, 2020
@Mark-Simulacrum Mark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label May 9, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request May 11, 2020
…ulacrum

[beta] backports

This backport rollup includes the following:
 * [beta] Update cargo rust-lang#71967
 * Backport 1.43.1 release notes to master rust-lang#71914
 * Update the `cc` crate rust-lang#71882
 * resolve: Relax fresh binding disambiguation slightly to fix regression rust-lang#71846
 * Do not try to find binop method on RHS `TyErr` rust-lang#71810
 * Quick and dirty fix of the unused_braces lint rust-lang#71517
 * Update stdarch submodule rust-lang#71495
 * normalize field projection ty to fix broken MIR issue rust-lang#71488
 * Update openssl-src to 1.1.1g rust-lang#71430
 * fix error code in E0751.md rust-lang#71426
 * Don't fuse Chain in its second iterator rust-lang#71404
 * Remove some `Vec` allocations to improve performance rust-lang#71268
 * [CI] Use the latest Python available on Windows rust-lang#71995

It also switches the bootstrap compiler to 1.43.1.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. 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.

broken MIR NoSolution sized array initialiser with addition in generic tuple destructure
7 participants