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

Fix emission of niche-filling discriminant values #55701

Merged
merged 1 commit into from Nov 12, 2018

Conversation

Projects
None yet
4 participants
@tromey
Contributor

tromey commented Nov 5, 2018

Bug #55606 points out a regression introduced by #54004; namely that
an assertion can erroneously fire when a niche-filling discriminant
value is emitted.

This fixes the bug by removing the assertion, and furthermore by
arranging for the discriminant value to be masked according to the
size of the niche. This makes handling the discriminant a bit simpler
for debuggers.

The test case is from Jonathan Turner.

Closes #55606

Fix emission of niche-filling discriminant values
Bug #55606 points out a regression introduced by #54004; namely that
an assertion can erroneously fire when a niche-filling discriminant
value is emitted.

This fixes the bug by removing the assertion, and furthermore by
arranging for the discriminant value to be masked according to the
size of the niche.  This makes handling the discriminant a bit simpler
for debuggers.

The test case is from Jonathan Turner.

Closes #55606
@rust-highfive

This comment has been minimized.

Collaborator

rust-highfive commented Nov 5, 2018

r? @matthewjasper

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

// CHECK: {{.*}}DIDerivedType{{.*}}tag: DW_TAG_member,{{.*}}name: "Error",{{.*}}extraData: i64 0{{[,)].*}}
#![feature(never_type)]
#![feature(nll)]

This comment has been minimized.

@matthewjasper

matthewjasper Nov 10, 2018

Contributor

This appears to be unnecessary

@matthewjasper

This comment has been minimized.

Contributor

matthewjasper commented Nov 10, 2018

@bors r+

@bors

This comment has been minimized.

Contributor

bors commented Nov 10, 2018

📌 Commit 4d20dd4 has been approved by matthewjasper

bors added a commit that referenced this pull request Nov 12, 2018

Auto merge of #55701 - tromey:ice-fix, r=matthewjasper
Fix emission of niche-filling discriminant values

Bug #55606 points out a regression introduced by #54004; namely that
an assertion can erroneously fire when a niche-filling discriminant
value is emitted.

This fixes the bug by removing the assertion, and furthermore by
arranging for the discriminant value to be masked according to the
size of the niche.  This makes handling the discriminant a bit simpler
for debuggers.

The test case is from Jonathan Turner.

Closes #55606
@bors

This comment has been minimized.

Contributor

bors commented Nov 12, 2018

⌛️ Testing commit 4d20dd4 with merge d1d79ae...

@bors

This comment has been minimized.

Contributor

bors commented Nov 12, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: matthewjasper
Pushing d1d79ae to master...

@bors bors merged commit 4d20dd4 into rust-lang:master Nov 12, 2018

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details

@tromey tromey deleted the tromey:ice-fix branch Nov 12, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment