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

Do not ICE when we have -Zunpretty=expanded with invalid ABI #99360

Merged
merged 1 commit into from
Jul 18, 2022

Conversation

compiler-errors
Copy link
Member

Fixes #99331

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

r? @fee1-dead

(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 Jul 17, 2022
&format!("unrecognized ABI not caught in lowering: {}", abi),
);
if self.sess.opts.pretty.map_or(true, |ppm| ppm.needs_hir()) {
self.sess.parse_sess.span_diagnostic.delay_span_bug(
Copy link
Member Author

@compiler-errors compiler-errors Jul 17, 2022

Choose a reason for hiding this comment

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

Question: Do we want to error when we have an invalid ABI and we don't go thru HIR lowering, like with -Zunpretty=expanded?

Since we're not going thru HIR lowering, we don't emit the error at the normal place we expect it, but if we want, we could emit an error instead of delaying an error here, depending on the pretty print mode.

Right now this just allows invalid ABI strings, but I have no strong opinions either way.

Copy link
Member

Choose a reason for hiding this comment

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

Per the reference there should be no ast-level constraint for abi. I think it is fine to leave it as is in ast.

@fee1-dead
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Jul 17, 2022

📌 Commit 26ecd44 has been approved by fee1-dead

It is now in the queue for this repository.

@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 Jul 17, 2022
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Jul 17, 2022
…-dead

Do not ICE when we have `-Zunpretty=expanded` with invalid ABI

Fixes rust-lang#99331
This was referenced Jul 17, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 18, 2022
Rollup of 6 pull requests

Successful merges:

 - rust-lang#98383 (Remove restrictions on compare-exchange memory ordering.)
 - rust-lang#99350 (Be more precise when suggesting removal of parens on unit ctor)
 - rust-lang#99356 (Do not constraint TAITs when checking impl/trait item compatibility)
 - rust-lang#99360 (Do not ICE when we have `-Zunpretty=expanded` with invalid ABI)
 - rust-lang#99373 (Fix source code sidebar tree auto-expand)
 - rust-lang#99374 (Fix doc for `rchunks_exact`)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit f3a458f into rust-lang:master Jul 18, 2022
@rustbot rustbot added this to the 1.64.0 milestone Jul 18, 2022
@compiler-errors compiler-errors deleted the issue-99331 branch August 11, 2023 20:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Development

Successfully merging this pull request may close these issues.

ICE: compiler error is promoted to ICE with -Zunpretty=expanded: "unrecognized ABI not caught in lowering"
5 participants