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

debuginfo: Fix type description generic enum discriminants. #27070

Merged
merged 1 commit into from
Jul 17, 2015

Conversation

michaelwoerister
Copy link
Member

This fixes an issue that @alexcrichton found while trying to upgrade LLVM: So far the code has assumed that the type of a generic enum's discriminant always was the same, regardless of any type arguments. This is not true. An Option<i16> will have a 16 bit discriminant, while an Option<i32> will have a 32 bit discriminant. This PR fixes this.

@rust-highfive
Copy link
Collaborator

r? @Aatch

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

@alexcrichton
Copy link
Member

@bors: r+ f9a20bb

Thanks!

@tamird
Copy link
Contributor

tamird commented Jul 16, 2015

An Option will have a 16 bit discriminant, while an Option will have a 32 bit discriminant.

Something wrong with this sentence

bors added a commit that referenced this pull request Jul 17, 2015
@Manishearth
Copy link
Member

This might be causing a test failure http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/5712

@bors
Copy link
Contributor

bors commented Jul 17, 2015

⌛ Testing commit f9a20bb with merge b465213...

@Manishearth
Copy link
Member

@bors r-

@Manishearth
Copy link
Member

@bors r- force

(fails tests)

@alexcrichton
Copy link
Member

I'm gonna land this as part of #27076 and just ignore the LLDB half of things for now (this is being tested on gdb and fixes bugs elsewhere in the upgrade). I'll open an issue about dealing with the LLDB failure, however, so we can be sure to keep track of it as it definitely looks like it should be investigated!

@Manishearth
Copy link
Member

Sure!

(was just r-ing so it won't clog up the queue 😄 )

@bors bors merged commit f9a20bb into rust-lang:master Jul 17, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants