rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Avoid ICE: Check diagnostic is error before downgrading

Browse Source 
Fix #119633.
This commit is contained in:
Esteban Küber
2024-01-08 23:00:06 +00:00
parent 88189a71e4
commit b1688b48d2
5 changed files with 99 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
compiler/rustc_hir_analysis/src/astconv/lint.rs
View File

@@ -122,7 +122,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
],
Applicability::MachineApplicable,
);
} else {
} else if diag.is_error() {
// We'll emit the object safety error already, with a structured suggestion.
diag.downgrade_to_delayed_bug();
}
@@ -148,8 +148,10 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
}
if !is_object_safe {
diag.note(format!("`{trait_name}` it is not object safe, so it can't be `dyn`"));
// We'll emit the object safety error already, with a structured suggestion.
diag.downgrade_to_delayed_bug();
if diag.is_error() {
// We'll emit the object safety error already, with a structured suggestion.
diag.downgrade_to_delayed_bug();
}
} else {
let sugg = if let hir::TyKind::TraitObject([_, _, ..], _, _) = self_ty.kind {
// There are more than one trait bound, we need surrounding parentheses.