Skip to content

Commit

Permalink
Explicitly call emit_stashed_diagnostics.
Browse files Browse the repository at this point in the history
Commit 72b172b in rust-lang#121206 changed things so that
`emit_stashed_diagnostics` is only called from `run_compiler`. But
rustfmt doesn't use `run_compiler`, so it needs to call
`emit_stashed_diagnostics` itself to avoid an abort in
`DiagCtxtInner::drop` when stashed diagnostics occur.

Fixes rust-lang#121450.
  • Loading branch information
nnethercote committed Feb 23, 2024
1 parent 163c3eb commit ce71137
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 5 deletions.
18 changes: 13 additions & 5 deletions src/parse/parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -163,13 +163,21 @@ impl<'a> Parser<'a> {
fn parse_crate_mod(&mut self) -> Result<ast::Crate, ParserError> {
let mut parser = AssertUnwindSafe(&mut self.parser);

match catch_unwind(move || parser.parse_crate_mod()) {
Ok(Ok(k)) => Ok(k),
Ok(Err(db)) => {
// rustfmt doesn't use `run_compiler` like other tools, so it must emit
// any stashed diagnostics itself, otherwise the `DiagCtxt` will assert
// when dropped. The final result here combines the parsing result and
// the `emit_stashed_diagnostics` result.
let parse_res = catch_unwind(move || parser.parse_crate_mod());
let stashed_res = self.parser.dcx().emit_stashed_diagnostics();
let err = Err(ParserError::ParsePanicError);
match (parse_res, stashed_res) {
(Ok(Ok(k)), None) => Ok(k),
(Ok(Ok(_)), Some(_guar)) => err,
(Ok(Err(db)), _) => {
db.emit();
Err(ParserError::ParseError)
err
}
Err(_) => Err(ParserError::ParsePanicError),
(Err(_), _) => err,
}
}
}
7 changes: 7 additions & 0 deletions src/test/parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -55,3 +55,10 @@ fn crate_parsing_errors_on_unclosed_delims() {
let filename = "tests/parser/unclosed-delims/issue_4466.rs";
assert_parser_error(filename);
}

#[test]
fn crate_parsing_stashed_diag() {
// See also https://github.com/rust-lang/rust/issues/121450
let filename = "tests/parser/stashed-diag.rs";
assert_parser_error(filename);
}
3 changes: 3 additions & 0 deletions tests/parser/stashed-diag.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#![u={static N;}]

fn main() {}

0 comments on commit ce71137

Please sign in to comment.