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

erase late-bound regions in dyn projection types for debuginfo #95020

Merged
merged 1 commit into from
Mar 18, 2022

Conversation

compiler-errors
Copy link
Member

simply skipping the binder leaves late-bound regions that will cause debug assertions to fail when checking the layout of the projection ty, so let's erase the regions instead.

sorry for taking so long to put this up, had trouble getting rustc set up on a new computer.

fixes #94998

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Mar 16, 2022
@rust-highfive
Copy link
Collaborator

r? @estebank

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 16, 2022
@compiler-errors
Copy link
Member Author

cc: @jackh726, @michaelwoerister, or @lqd if one of yall care to review this since y'all were involved in #94998 and related issues.

@matthiaskrgr
Copy link
Member

Could this fix some of the older tickets as well, or are these "different" bugs?
https:/rust-lang/rust/issues?q=is%3Aissue+is%3Aopen+value.has_escaping_bound_vars

@compiler-errors
Copy link
Member Author

@matthiaskrgr probably not, since I think this is not a generalized fix, and each of these is likely due to a unique mishandling of Binder.

#92537 and #92271 might be related/fixed by this one, though, since it has to do with debuginfo, though I am unable to test them because I don't have a windows machine.

@jackh726
Copy link
Member

@bors delegate+ p=1

r=me on this. Not sure if @michaelwoerister has any additional thoughts for e.g. debug symbol names for the test. Let's make sure this hits nightly either way; seems to be getting hit a lot and we can also add more thorough tests.

@bors
Copy link
Contributor

bors commented Mar 16, 2022

✌️ @compiler-errors can now approve this pull request

@compiler-errors
Copy link
Member Author

CI is passing and Jack had a good point to get it into tonight's nightly, so I will land this now. @michaelwoerister please let me know if I should do any follow-up fixes.

@bors r=jackh726

@bors
Copy link
Contributor

bors commented Mar 16, 2022

📌 Commit b69b3d0 has been approved by jackh726

@bors
Copy link
Contributor

bors commented Mar 16, 2022

🌲 The tree is currently closed for pull requests below priority 100. This pull request will be tested once the tree is reopened.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 16, 2022
@compiler-errors
Copy link
Member Author

compiler-errors commented Mar 16, 2022

Hiya @Dylan-DPC! The tree is closed due to #94997 which is another debuginfo fix, right? Can I p=100 this to make sure it lands on the next nightly, or do we expect the tree to open soon?

edit: Oh, tree is closed due to infra issues. nvm!

@ehuss
Copy link
Contributor

ehuss commented Mar 17, 2022

@bors treeclosed-

@bors
Copy link
Contributor

bors commented Mar 17, 2022

⌛ Testing commit b69b3d0 with merge 7142f4c41789d00f4e890aab871942853b93540d...

@bors
Copy link
Contributor

bors commented Mar 17, 2022

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 17, 2022
@ehuss
Copy link
Contributor

ehuss commented Mar 17, 2022

@bors treeclosed=100

@ehuss
Copy link
Contributor

ehuss commented Mar 17, 2022

@bors r=jackh726

@bors
Copy link
Contributor

bors commented Mar 17, 2022

💡 This pull request was already approved, no need to approve it again.

  • This pull request previously failed. You should add more commits to fix the bug, or use retry to trigger a build again.
  • There's another pull request that is currently being tested, blocking this pull request: Implement -Z oom=panic #88098

@bors
Copy link
Contributor

bors commented Mar 17, 2022

📌 Commit b69b3d0 has been approved by jackh726

@bors
Copy link
Contributor

bors commented Mar 17, 2022

🌲 The tree is currently closed for pull requests below priority 100. This pull request will be tested once the tree is reopened.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 17, 2022
@RalfJung
Copy link
Member

https://www.githubstatus.com/ is green again so let's see if we can re-open the tree...
@bors treeclosed-

@bors
Copy link
Contributor

bors commented Mar 17, 2022

⌛ Testing commit b69b3d0 with merge 91f598a88570d1cf2f2f86876065a2a6f8d184ba...

@compiler-errors
Copy link
Member Author

@RalfJung: this will probably fail again until @ehuss is done investigating issues with the ppc64-linux target in #95046. I don't think bors was failing just because of github issues. See the zulip thread.

@bors
Copy link
Contributor

bors commented Mar 17, 2022

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 17, 2022
@Dylan-DPC
Copy link
Member

@bors treeclosed=100

@jackh726
Copy link
Member

@bors retry

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 17, 2022
@RalfJung
Copy link
Member

Oh, sorry -- the timing made it look like this was due to the GH issues...

@bors
Copy link
Contributor

bors commented Mar 17, 2022

⌛ Testing commit b69b3d0 with merge 4ca56d2...

@bors
Copy link
Contributor

bors commented Mar 18, 2022

☀️ Test successful - checks-actions
Approved by: jackh726
Pushing 4ca56d2 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 18, 2022
@bors bors merged commit 4ca56d2 into rust-lang:master Mar 18, 2022
@rustbot rustbot added this to the 1.61.0 milestone Mar 18, 2022
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (4ca56d2): comparison url.

Summary: This benchmark run did not return any relevant results. 3 results were found to be statistically significant but too small to be relevant.

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

assertion failed: !value.has_escaping_bound_vars(): ICE when compiling crate tracing-subscriber v0.3.9