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.

Sign up for GitHub

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

Jump to bottom

debuginfo: Fix ICE when generating name for type that produces a layout error. #94997

Merged
merged 1 commit into from
Mar 18, 2022
Merged

debuginfo: Fix ICE when generating name for type that produces a layout error. #94997

merged 1 commit into from
Mar 18, 2022
+67 −2

Conversation

michaelwoerister
Copy link
Member

Fixes #94961.

@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? @cjgillot

(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
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@michaelwoerister michaelwoerister force-pushed the fix-enum-type-name-layout-error branch from 91075e9 to 863969d Compare March 16, 2022 10:32
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@michaelwoerister michaelwoerister force-pushed the fix-enum-type-name-layout-error branch from 863969d to d178ddd Compare March 16, 2022 13:52
wesleywiser
wesleywiser approved these changes Mar 16, 2022
View reviewed changes
Copy link
Member

@wesleywiser wesleywiser left a comment

Choose a reason for hiding this comment

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

r=me with nit addressed

compiler/rustc_codegen_ssa/src/debuginfo/type_names.rs Outdated Show resolved Hide resolved
@wesleywiser
Copy link
Member

r? @wesleywiser

@wesleywiser wesleywiser assigned wesleywiser and unassigned cjgillot Mar 16, 2022
@michaelwoerister michaelwoerister force-pushed the fix-enum-type-name-layout-error branch from d178ddd to 243e2a6 Compare March 16, 2022 14:58
@michaelwoerister
Copy link
Member Author

Thanks for the review, @wesleywiser!

@bors r=wesleywiser rollup

@bors
Copy link
Contributor

bors commented Mar 16, 2022

📌 Commit 243e2a6 has been approved by wesleywiser

@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
@bors
Copy link
Contributor

bors commented Mar 16, 2022

⌛ Testing commit 243e2a6 with merge ad557687de01506ee8e1919931b165650a09786a...

@Dylan-DPC
Copy link
Member

@bors treeclosed=100

1 similar comment
@Dylan-DPC
Copy link
Member

@bors treeclosed=100

@Dylan-DPC
Copy link
Member

@bors ping

@michaelwoerister michaelwoerister mentioned this pull request Mar 16, 2022
Closed
@bors
Copy link
Contributor

bors commented Mar 16, 2022

😪 I'm awake I'm awake

@rust-log-analyzer
Copy link
Collaborator

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

@bors
Copy link
Contributor

bors commented Mar 16, 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 16, 2022
@bors bors mentioned this pull request Mar 16, 2022
Merged
@bors bors mentioned this pull request Mar 16, 2022
Merged
@compiler-errors
Copy link
Member

Someone want to bors-retry this? Looks spurious.

@lqd
Copy link
Member

lqd commented Mar 16, 2022 •
edited
Loading

the tree is still closed, but let's add it back to the queue for a rollup

@lqd
Copy link
Member

lqd commented Mar 16, 2022

@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 16, 2022
This was referenced Mar 16, 2022
Merged
Merged
@Dylan-DPC Dylan-DPC mentioned this pull request Mar 17, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 18, 2022
@bors
Auto merge of rust-lang#95056 - Dylan-DPC:rollup-swtuw2n, r=Dylan-DPC
cd11905 
Rollup of 10 pull requests

Successful merges:

 - rust-lang#91133 (Improve `unsafe` diagnostic)
 - rust-lang#93222 (Make ErrorReported impossible to construct outside `rustc_errors`)
 - rust-lang#93745 (Stabilize ADX target feature)
 - rust-lang#94309 ([generator_interior] Be more precise with scopes of borrowed places)
 - rust-lang#94698 (Remove redundant code from copy-suggestions)
 - rust-lang#94731 (Suggest adding `{ .. }` around a const function call with arguments)
 - rust-lang#94960 (Fix many spelling mistakes)
 - rust-lang#94982 (Add deprecated_safe feature gate and attribute, cc rust-lang#94978)
 - rust-lang#94997 (debuginfo: Fix ICE when generating name for type that produces a layout error.)
 - rust-lang#95000 (Fixed wrong type name in comment)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit e55400c into rust-lang:master Mar 18, 2022
@rustbot rustbot added this to the 1.61.0 milestone Mar 18, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wesleywiser wesleywiser wesleywiser approved these changes

Assignees

@wesleywiser wesleywiser

Labels
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
Milestone
1.61.0
10 participants
@michaelwoerister @rust-highfive @rust-log-analyzer @wesleywiser @bors @Dylan-DPC @compiler-errors @lqd @cjgillot @rustbot