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

Fix ICE report flags display. #101595

Merged
merged 1 commit into from
Sep 10, 2022
Merged

Conversation

ehuss
Copy link
Contributor

@ehuss ehuss commented Sep 8, 2022

#92310 made some changes to the ICE report that displays the rustc flags, but it introduced a bug where a flag like -Z incremental-verify-ich=yes was being treated as-if it was -Cincremental. This corrupted the output and made it confusing. The cause was using starts_with instead of properly splitting the option.

For example, with the command like rustc foo.rs -Cincremental=/tmp/a -Zincremental-verify-ich=yes --crate-type lib would previously look like:

note: compiler flags: -C incremental -Z incremental --crate-type lib

It now looks like:

note: compiler flags: -C incremental=[REDACTED] -Z incremental-verify-ich=yes --crate-type lib

I added a [REDACTED] marker for -Cincremental so it is a little less confusing that a value has been removed.

Fixes #101588

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

r? @jackh726

(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 Sep 8, 2022
@tmiasko
Copy link
Contributor

tmiasko commented Sep 9, 2022

@bors r+

@bors
Copy link
Contributor

bors commented Sep 9, 2022

📌 Commit ed0f037 has been approved by tmiasko

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 Sep 9, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 10, 2022
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#101413 (Use RelocModel::Pic for UEFI targets)
 - rust-lang#101595 (Fix ICE report flags display.)
 - rust-lang#101616 (Adapt test for msan message change)
 - rust-lang#101624 (rustdoc: remove unused CSS `#search { position: relative }`)
 - rust-lang#101633 (Rustdoc-Json: Correcty handle intra-doc-links to items without HTML page)
 - rust-lang#101634 (Rustdoc-Json Tests: Use ``@is`` and ``@ismany`` more often.)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 3ddb048 into rust-lang:master Sep 10, 2022
@rustbot rustbot added this to the 1.65.0 milestone Sep 10, 2022
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.

rustc lost compiler flag information in its backtrace
6 participants