Skip to content

loosen assertion against proj in collector - #36876

Merged
bors merged 1 commit into
rust-lang:masterfrom
nikomatsakis:issue-36381
Oct 4, 2016
Merged

loosen assertion against proj in collector#36876
bors merged 1 commit into
rust-lang:masterfrom
nikomatsakis:issue-36381

Conversation

@nikomatsakis

@nikomatsakisnikomatsakis commented Sep 30, 2016

Copy link
Copy Markdown
Contributor

The collector was asserting a total absence of projections, but some projections are expected, even in trans: in particular, projections containing higher-ranked regions, which we don't currently normalize.

r? @pnkfelix

Fixes#36381

jonas-schievink
jonas-schievink reviewed Sep 30, 2016
View reviewed changes
Comment threadsrc/librustc_trans/collector.rs Outdated

@jonas-schievinkjonas-schievinkSep 30, 2016

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.

Why only comment this out?

@pnkfelixpnkfelixSep 30, 2016

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.

you mean versus remove it entirely?

@pnkfelixpnkfelixSep 30, 2016

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.

Still, I have to admit: @nikomatsakis it does not seem like you are ever actually reading the newly added HAS_NORMALIZABLE_PROJECTION bit; you are merely setting it...? Did you intend to incorporate that bit into this assertion, and then you changed your mind and decided to just remove the assertion entirely?

@jonas-schievinkjonas-schievinkSep 30, 2016

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.

Yes, this doesn't "loosen" the assertion, it disables it. Looks like the change to the assertion is incomplete or something.

@nikomatsakisnikomatsakisOct 1, 2016

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Er, I didn't mean to commit that part.

@pnkfelix

pnkfelix commented Oct 3, 2016

Copy link
Copy Markdown
Contributor

@nikomatsakis r=me once you address the travis failure.

@nikomatsakis
loosen assertion against proj in collector
58b75f7
The collector was asserting a total absence of projections, but some
projections are expected, even in trans: in particular, projections
containing higher-ranked regions, which we don't currently normalize.
@nikomatsakis

nikomatsakis commented Oct 3, 2016

Copy link
Copy Markdown
ContributorAuthor

@bors r=pnkfelix

@bors

bors commented Oct 3, 2016

Copy link
Copy Markdown
Collaborator

📌 Commit 58b75f7 has been approved by pnkfelix

@bors

bors commented Oct 4, 2016

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 58b75f7 with merge 5ea241b...

bors added a commit that referenced this pull request Oct 4, 2016
@bors
Auto merge of#36876- nikomatsakis:issue-36381, r=pnkfelix
5ea241b
loosen assertion against proj in collector
The collector was asserting a total absence of projections, but some projections are expected, even in trans: in particular, projections containing higher-ranked regions, which we don't currently normalize.
r? @pnkfelixFixes#36381
@bors

bors commented Oct 4, 2016

Copy link
Copy Markdown
Collaborator

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-cargotest, auto-linux-64-cross-freebsd, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-opt-rustbuild, auto-linux-64-x-android-t, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-32-opt, auto-mac-64-opt, auto-mac-64-opt-rustbuild, auto-mac-cross-ios-opt, auto-win-gnu-32-opt, auto-win-gnu-32-opt-rustbuild, auto-win-gnu-64-opt, auto-win-msvc-32-opt, auto-win-msvc-64-cargotest, auto-win-msvc-64-opt, auto-win-msvc-64-opt-rustbuild
Approved by: pnkfelix
Pushing 5ea241b to master...

@bors
bors merged commit 58b75f7 into rust-lang:masterOct 4, 2016
@nikomatsakis

nikomatsakis commented Oct 4, 2016

Copy link
Copy Markdown
ContributorAuthor

@pnkfelix do you think we ought to beta backport, actually? This is a stable-to-stable regression, I guess.

@pnkfelixpnkfelix added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Oct 10, 2016
@nikomatsakisnikomatsakis added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Oct 11, 2016
@nikomatsakis

nikomatsakis commented Oct 11, 2016

Copy link
Copy Markdown
ContributorAuthor

Accepting for backport because tiny patch, fixes regression.

cc @rust-lang/compiler

@alexcrichtonalexcrichton mentioned this pull request Oct 11, 2016
Merged
@brsonbrson removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Oct 11, 2016
@brsonbrson mentioned this pull request Oct 14, 2016
Merged
@nikomatsakis
nikomatsakis deleted the issue-36381 branch April 14, 2017 10:13
@djzindjzin mentioned this pull request Apr 29, 2017
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

2 more reviewers
@pnkfelixpnkfelixpnkfelix left review comments
@jonas-schievinkjonas-schievinkjonas-schievink left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@pnkfelixpnkfelix

Labels

beta-acceptedAccepted for backporting to the compiler in the beta channel.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@nikomatsakis@pnkfelix@bors@jonas-schievink@brson