-
Notifications
You must be signed in to change notification settings - Fork 12.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Rollup merge of #122578 - jieyouxu:guard-decorate, r=fee1-dead
Only invoke `decorate` if the diag can eventually be emitted Lints can call [`trimmed_def_paths`](https://doc.rust-lang.org/nightly/nightly-rustc/rustc_middle/ty/print/fn.trimmed_def_paths.html#), such as through manual implementations of `LintDiagnostic` and calling `def_path_str`. https://github.com/rust-lang/rust/blob/05a2be3def211255dc7640b006ac10f0f02baf5c/compiler/rustc_lint/src/lints.rs#L1834-L1839 The emission of a lint eventually relies on [`TyCtxt::node_lint`](https://doc.rust-lang.org/nightly/nightly-rustc/rustc_middle/ty/context/struct.TyCtxt.html#method.node_lint), which has a `decorate` closure which is responsible for decorating the diagnostic with "lint stuff". `node_lint` in turn relies on [`lint_level`](https://doc.rust-lang.org/nightly/nightly-rustc/rustc_middle/lint/fn.lint_level.html). Within `lint_level`, `decorate` is eventually called just before `Diag::emit` is called to decorate the diagnostic. However, if `-A warnings` or `--cap-lint=allow` are set, or if the unused_must_use lint is explicitly allowed, then `decorate` would be called, which would call `def_path_str`, but the diagnostic would never be emitted and hence would trigger the `must_produce_diag` ICE. To avoid calling `decorate` when we don't eventually emit the diagnostic, we check that: - if `--force-warn` is specified, then call `decorate`; otherwise - if we can emit warnings (or higher), then call `decorate`. Fixes #121774.
- Loading branch information
Showing
6 changed files
with
98 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
// Checks that the following does not ICE because `decorate` is incorrectly skipped. | ||
|
||
//@ compile-flags: -Dunused_must_use -Awarnings --crate-type=lib | ||
|
||
#[must_use] | ||
fn f() {} | ||
|
||
pub fn g() { | ||
f(); | ||
//~^ ERROR unused return value | ||
} |
14 changes: 14 additions & 0 deletions
14
tests/ui/lint/decorate-ice/decorate-can-emit-warnings.stderr
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
error: unused return value of `f` that must be used | ||
--> $DIR/decorate-can-emit-warnings.rs:9:5 | ||
| | ||
LL | f(); | ||
| ^^^ | ||
| | ||
= note: requested on the command line with `-D unused-must-use` | ||
help: use `let _ = ...` to ignore the resulting value | ||
| | ||
LL | let _ = f(); | ||
| +++++++ | ||
|
||
error: aborting due to 1 previous error | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
// Checks that the following does not ICE. | ||
// | ||
// Previously, this test ICEs when the `unused_must_use` lint is suppressed via the combination of | ||
// `-A warnings` and `--cap-lints=warn`, because: | ||
// | ||
// - Its lint diagnostic struct `UnusedDef` implements `LintDiagnostic` manually and in the impl | ||
// `def_path_str` was called (which calls `trimmed_def_path`, which will produce a | ||
// `must_produce_diag` ICE if a trimmed def path is constructed but never emitted in a diagnostic | ||
// because it is expensive to compute). | ||
// - A `LintDiagnostic` has a `decorate_lint` method which decorates a `Diag` with lint-specific | ||
// information. This method is wrapped by a `decorate` closure in `TyCtxt` diagnostic emission | ||
// machinery, and the `decorate` closure called as late as possible. | ||
// - `decorate`'s invocation is delayed as late as possible until `lint_level` is called. | ||
// - If a lint's corresponding diagnostic is suppressed (to be effectively allow at the final | ||
// emission time) via `-A warnings` or `--cap-lints=allow` (or `-A warnings` + `--cap-lints=warn` | ||
// like in this test case), `decorate` is still called and a diagnostic is still constructed -- | ||
// but the diagnostic is never eventually emitted, triggering the aforementioned | ||
// `must_produce_diag` ICE due to use of `trimmed_def_path`. | ||
// | ||
// Issue: <https://github.com/rust-lang/rust/issues/121774>. | ||
|
||
//@ compile-flags: -Dunused_must_use -Awarnings --cap-lints=warn --crate-type=lib | ||
//@ check-pass | ||
|
||
#[must_use] | ||
fn f() {} | ||
|
||
pub fn g() { | ||
f(); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
// Checks that the following does not ICE because `decorate` is incorrectly skipped due to | ||
// `--force-warn`. | ||
|
||
//@ compile-flags: -Dunused_must_use -Awarnings --force-warn unused_must_use --crate-type=lib | ||
//@ check-pass | ||
|
||
#[must_use] | ||
fn f() {} | ||
|
||
pub fn g() { | ||
f(); | ||
//~^ WARN unused return value | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
warning: unused return value of `f` that must be used | ||
--> $DIR/decorate-force-warn.rs:11:5 | ||
| | ||
LL | f(); | ||
| ^^^ | ||
| | ||
= note: requested on the command line with `--force-warn unused-must-use` | ||
help: use `let _ = ...` to ignore the resulting value | ||
| | ||
LL | let _ = f(); | ||
| +++++++ | ||
|
||
warning: 1 warning emitted | ||
|