Skip to content

More through normalization, Feb/Mar 2017 edition - #40163

Merged
bors merged 4 commits into
rust-lang:masterfrom
arielb1:normalization-1702
Mar 4, 2017
Merged

More through normalization, Feb/Mar 2017 edition#40163
bors merged 4 commits into
rust-lang:masterfrom
arielb1:normalization-1702

Conversation

@arielb1

@arielb1arielb1 commented Feb 28, 2017•
edited
Loading

Copy link
Copy Markdown
Contributor

Fix a few normalization bugs.

Fixes#27901.
Fixes#28828.
Fixes#38135.
Fixes#39363.
Fixes#39367.

@rust-highfive

rust-highfive commented Feb 28, 2017

Copy link
Copy Markdown
Contributor

r? @pnkfelix

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

@arielb1

arielb1 commented Mar 1, 2017

Copy link
Copy Markdown
ContributorAuthor

r? @eddyb

@rust-highfiverust-highfive assigned eddyb and unassigned pnkfelixMar 1, 2017
@arielb1

arielb1 commented Mar 1, 2017•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

Don't merge - there's still a test (default_ty_param_default_dependent_associated_type) that causes broken MIR - silently until now - which is now an ICE.

EDIT: found a fix to that.

eddyb
eddyb approved these changes Mar 1, 2017
View reviewed changes

@eddybeddyb left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM, but the Lvalue::Static change makes me nervous. cc @rust-lang/compiler Any opinions?

@arielb1
arielb1force-pushed the normalization-1702 branch from fa396b1 to 0037a9aCompareMarch 1, 2017 01:40
@arielb1

arielb1 commented Mar 1, 2017

Copy link
Copy Markdown
ContributorAuthor

Can @nikomatsakis confirm that I didn't break new-style default inference in 4dee3c45080b5f9b917f8d4696adb424ff67a28e ?

@nikomatsakis

nikomatsakis commented Mar 1, 2017

Copy link
Copy Markdown
Contributor

r? @nikomatsakis -- I will review today.

@aravind-pg

aravind-pg commented Mar 1, 2017

Copy link
Copy Markdown
Contributor

The third issue linked in the PR description (#38185) must have a typo, since currently it's an unrelated PR and not an issue.

@arielb1
more through normalization in typeck & trans
ca87082
Fixesrust-lang#27901.
Fixesrust-lang#28828.
Fixesrust-lang#38135.
Fixesrust-lang#39363.
@arielb1
store the normalized types of statics in MIR Lvalues
34ff9aa
The types of statics, like all other items, are stored in the tcx
unnormalized. This is necessarily so, because
a) Item types other than statics have generics, which can't be
normalized.
b) Eager normalization causes undesirable on-demand dependencies.
Keeping with the principle that MIR lvalues require no normalization in
order to interpret, this patch stores the normalized type of the statics
in the Lvalue and reads it to get the lvalue type.
Fixesrust-lang#39367.
@arielb1
fix a few more typeck normalization cases
2ecbc22
I'll like @nikomatsakis or someone to look at the unsolved variable
case.
@arielb1
transform broken MIR warnings to hard ICEs
4aede75
We ought to do that sometime, and this PR fixes all broken MIR errors I
could find.
@arielb1

arielb1 commented Mar 1, 2017•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

@aravind-pg

Fixed

@arielb1
arielb1force-pushed the normalization-1702 branch from 0037a9a to 4aede75CompareMarch 1, 2017 14:56
@nikomatsakis

nikomatsakis commented Mar 3, 2017

Copy link
Copy Markdown
Contributor

@arielb1 this looks good, I think I will do a crater run perhaps though? I see you changed the MIR stuff from warn to bug and I'm curious what may be affected...

@nikomatsakis

nikomatsakis commented Mar 3, 2017

Copy link
Copy Markdown
Contributor

Zero regressions found: https://gist.github.com/nikomatsakis/c380f63061941c4989faf58469f36356

@nikomatsakis

nikomatsakis commented Mar 3, 2017

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Mar 3, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 4aede75 has been approved by nikomatsakis

@bors

bors commented Mar 4, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 4aede75 with merge 8c6c0f8...

bors added a commit that referenced this pull request Mar 4, 2017
@bors
Auto merge of#40163- arielb1:normalization-1702, r=nikomatsakis
8c6c0f8
More through normalization, Feb/Mar 2017 edition
Fix a few normalization bugs.
Fixes#27901.
Fixes#28828.
Fixes#38135.
Fixes#39363.
Fixes#39367.
@borsbors mentioned this pull request Mar 4, 2017
Merged
@bors

bors commented Mar 4, 2017

Copy link
Copy Markdown
Collaborator

☀️ Test successful - status-appveyor, status-travis
Approved by: nikomatsakis
Pushing 8c6c0f8 to master...

@bors
bors merged commit 4aede75 into rust-lang:masterMar 4, 2017
@Mark-SimulacrumMark-Simulacrum mentioned this pull request Mar 5, 2017
Merged
arielb1 pushed a commit to arielb1/rust that referenced this pull request Mar 8, 2017
Ariel Ben-Yehuda
Rollup merge ofrust-lang#40268- Mark-Simulacrum:normalization-follo…
4eb7a33
…wup, r=arielb1
Fix normalization error
Follows rust-lang#40163. I don't know whether this is good, but seems logical.
[This block of code](https://github.com/rust-lang/rust/blob/ba07bd5d23aced6d4baa5696213b11ca832c1a5d/src/librustc_typeck/check/mod.rs#L2110-L2138) doesn't contain a call to `normalize_associated_types_in`, while [this](https://github.com/rust-lang/rust/blob/master/src/librustc_typeck/check/mod.rs#L2027-L2028) block does, and is nearly identical.
Ideally these two blocks should be unified into one, but since the change doesn't seem trivial and I'm unsure if this patch will be accepted it hasn't been done yet.
r? @arielb1
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
@eddybeddybeddyb approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@nikomatsakisnikomatsakis

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@arielb1@rust-highfive@nikomatsakis@aravind-pg@bors@eddyb@pnkfelix