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

small fix to closure debuginfo #38483

Merged
merged 1 commit into from Dec 21, 2016
Merged

Conversation

@camlorn
Copy link
Contributor

camlorn commented Dec 20, 2016

This is fallout from #37429. The faking we do to make closures appear to have local variables was broken and made it through CI because the debuginfo tests got turned off.

This probably needs a dedicated test, but I wanted to get this in as quickly as possible because we probably need to backport this to the beta.

r? @alexcrichton

@rust-highfive
Copy link
Collaborator

rust-highfive commented Dec 20, 2016

r? @arielb1

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

@camlorn camlorn changed the title This fixes closure debuginfo so that the local variable faking we do works again. Fallout from #37429. small fix to closure debuginfo Dec 20, 2016
@camlorn
Copy link
Contributor Author

camlorn commented Dec 20, 2016

I just hit the wrong button and submitted this without a description, sorry.

EDIT(@eddyb): moved the rest of this comment to the PR description.

@alexcrichton
Copy link
Member

alexcrichton commented Dec 20, 2016

r? @eddyb

seems ok to me, but I'm probably not best to review

@eddyb
Copy link
Member

eddyb commented Dec 20, 2016

@bors r+

@bors
Copy link
Contributor

bors commented Dec 20, 2016

📌 Commit e1d8806 has been approved by eddyb

@alexcrichton
Copy link
Member

alexcrichton commented Dec 20, 2016

@bors: p=1

fixes a regression, so I think we'll want to land this soon hopefully

bors added a commit that referenced this pull request Dec 20, 2016
@bors bors merged commit e1d8806 into rust-lang:master Dec 21, 2016
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@nikomatsakis
Copy link
Contributor

nikomatsakis commented Dec 30, 2016

Marking as beta-accepted. Small (if...dense) patch, regression. cc @rust-lang/compiler

@nikomatsakis
Copy link
Contributor

nikomatsakis commented Dec 30, 2016

Definitely we want a test here...

@eddyb
Copy link
Member

eddyb commented Dec 30, 2016

@nikomatsakis IIRC we had a test but it wasn't running on the bots, @alexcrichton knows more.

@alexcrichton
Copy link
Member

alexcrichton commented Dec 30, 2016

Oh yes #37429 should have been prevented from landing in the first place due to it causing a regression to an existing test that this PR fixes. That test was erroneously not running and has since been fixed to run on all PRs.

In that sense I believe we've already got tests checked in for this.

@camlorn
Copy link
Contributor Author

camlorn commented Dec 30, 2016

I'm not sure what dense means but suspect it is bad; if you're referring to the description and the commit it's because I don't fully understand what's going on. @eddyb gets credit for this fix, and they tried to explain but not with much luck, I'm afraid.

I forget which test specifically checks this, but there are already tests examining closure-local variables.

@nikomatsakis
Copy link
Contributor

nikomatsakis commented Dec 30, 2016

@camlorn I didn't mean dense in a bad way, just meant that there are few lines changed, but the correctness of the changes is non-obvious -- although re-reading they actually look pretty simple.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

8 participants
You can’t perform that action at this time.