bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

migrate rustc_query_system to use SessionDiagnostic

Browse source 
with manual impl SessionDiagnostic
This commit is contained in:
Yuanheng Li 2022-08-21 21:37:05 +08:00 • committed by Li Yuanheng
parent 12e4fd0755
commit b8075e4550
6 changed files with 108 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

55
compiler/rustc_query_system/src/query/job.rs
View file

@ -1,12 +1,10 @@
use crate::query::plumbing::CycleError;
use crate::query::{QueryContext, QueryStackFrame};
use rustc_hir::def::DefKind;
use rustc_data_structures::fx::FxHashMap;
use rustc_errors::{
struct_span_err, Diagnostic, DiagnosticBuilder, ErrorGuaranteed, Handler, Level,
};
use rustc_session::Session;
use rustc_errors::{Diagnostic, DiagnosticBuilder, ErrorGuaranteed, Handler, Level};
use rustc_hir::def::DefKind;
use rustc_session::{Session, SessionDiagnostic};
use rustc_span::Span;
use std::hash::Hash;
@ -536,46 +534,29 @@ pub(crate) fn report_cycle<'a>(
assert!(!stack.is_empty());
let span = stack[0].query.default_span(stack[1 % stack.len()].span);
let mut err =
struct_span_err!(sess, span, E0391, "cycle detected when {}", stack[0].query.description);
let mut cycle_diag = crate::error::Cycle {
span,
upper_stack_info: Vec::with_capacity(stack.len() - 1),
stack_bottom: stack[0].query.description.to_owned(),
recursive_ty_alias: false,
recursive_trait_alias: false,
cycle_usage: usage.map(|(span, query)| (query.default_span(span), query.description)),
};
for i in 1..stack.len() {
let query = &stack[i].query;
let span = query.default_span(stack[(i + 1) % stack.len()].span);
err.span_note(span, &format!("...which requires {}...", query.description));
cycle_diag.upper_stack_info.push((span, query.description.to_owned()));
}
if stack.len() == 1 {
err.note(&format!("...which immediately requires {} again", stack[0].query.description));
} else {
err.note(&format!(
"...which again requires {}, completing the cycle",
stack[0].query.description
));
if stack.iter().all(|entry| entry.query.def_kind == Some(DefKind::TyAlias)) {
cycle_diag.recursive_ty_alias = true;
} else if stack.iter().all(|entry| entry.query.def_kind == Some(DefKind::TraitAlias)) {
cycle_diag.recursive_trait_alias = true;
}
if stack.iter().all(|entry| {
entry
.query
.def_kind
.map_or(false, |def_kind| matches!(def_kind, DefKind::TyAlias | DefKind::TraitAlias))
}) {
if stack.iter().all(|entry| {
entry.query.def_kind.map_or(false, |def_kind| matches!(def_kind, DefKind::TyAlias))
}) {
err.note("type aliases cannot be recursive");
err.help("consider using a struct, enum, or union instead to break the cycle");
err.help("see <https://doc.rust-lang.org/reference/types.html#recursive-types> for more information");
} else {
err.note("trait aliases cannot be recursive");
}
}
if let Some((span, query)) = usage {
err.span_note(query.default_span(span), &format!("cycle used when {}", query.description));
}
err
cycle_diag.into_diagnostic(&sess.parse_sess)
}
pub fn print_query_stack<CTX: QueryContext>(

14
compiler/rustc_query_system/src/query/plumbing.rs
View file

@ -618,16 +618,12 @@ fn incremental_verify_ich_cold(sess: &Session, dep_node: DebugArg<'_>, result: D
let old_in_panic = INSIDE_VERIFY_PANIC.with(|in_panic| in_panic.replace(true));
if old_in_panic {
sess.struct_err(
"internal compiler error: re-entrant incremental verify failure, suppressing message",
)
.emit();
sess.emit_err(crate::error::Reentrant);
} else {
sess.struct_err(&format!("internal compiler error: encountered incremental compilation error with {:?}", dep_node))
.help(&format!("This is a known issue with the compiler. Run {} to allow your project to compile", run_cmd))
.note("Please follow the instructions below to create a bug report with the provided information")
.note("See <https://github.com/rust-lang/rust/issues/84970> for more information")
.emit();
sess.emit_err(crate::error::IncrementCompilation {
run_cmd,
dep_node: format!("{:?}", dep_node),
});
panic!("Found unstable fingerprints for {:?}: {:?}", dep_node, result);
}