bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

correct span, add help message and add UI test when query depth overflows

Browse source
This commit is contained in:
SparrowLii 2022-09-15 15:45:17 +08:00
parent 44506f38e0
commit 89fd6ae458
8 changed files with 82 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

10
compiler/rustc_query_system/src/error.rs
View file

@ -1,5 +1,6 @@
use rustc_errors::AddSubdiagnostic;
use rustc_span::Span;
use rustc_session::Limit;
use rustc_span::{Span, Symbol};
pub struct CycleStack {
pub span: Span,
@ -76,17 +77,20 @@ pub struct IncrementCompilation {
}
#[derive(SessionDiagnostic)]
#[help]
#[diag(query_system::query_overflow)]
pub struct QueryOverflow {
#[primary_span]
pub span: Option<Span>,
#[subdiagnostic]
pub layout_of_depth: Option<LayoutOfDepth>,
pub suggested_limit: Limit,
pub crate_name: Symbol,
}
#[derive(SessionSubdiagnostic)]
#[note(query_system::layout_of_depth)]
pub struct LayoutOfDepth {
#[primary_span]
pub span: Span,
pub desc: String,
pub depth: usize,
}

2
compiler/rustc_query_system/src/lib.rs
View file

@ -23,4 +23,6 @@ pub mod query;
mod values;
pub use error::HandleCycleError;
pub use error::LayoutOfDepth;
pub use error::QueryOverflow;
pub use values::Value;

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

@ -160,10 +160,7 @@ impl QueryJobId {
#[cold]
#[inline(never)]
pub(super) fn try_find_layout_root(
&self,
query_map: QueryMap,
) -> Option<(QueryJobInfo, usize)> {
pub fn try_find_layout_root(&self, query_map: QueryMap) -> Option<(QueryJobInfo, usize)> {
let mut last_layout = None;
let mut current_id = Some(*self);
let mut depth = 0;

17
compiler/rustc_query_system/src/query/mod.rs
View file

@ -14,7 +14,7 @@ pub use self::caches::{
mod config;
pub use self::config::{QueryConfig, QueryDescription, QueryVTable};
use crate::dep_graph::{DepContext, DepNodeIndex, HasDepContext, SerializedDepNodeIndex};
use crate::dep_graph::{DepNodeIndex, HasDepContext, SerializedDepNodeIndex};
use rustc_data_structures::sync::Lock;
use rustc_errors::Diagnostic;
use rustc_hir::def::DefKind;
@ -123,18 +123,5 @@ pub trait QueryContext: HasDepContext {
compute: impl FnOnce() -> R,
) -> R;
fn depth_limit_error(&self, job: QueryJobId) {
let sess = self.dep_context().sess();
let mut layout_of_depth = None;
if let Some(map) = self.try_collect_active_jobs() {
if let Some((info, depth)) = job.try_find_layout_root(map) {
layout_of_depth = Some(crate::error::LayoutOfDepth {
span: info.job.span,
desc: info.query.description,
depth,
});
}
}
sess.emit_fatal(crate::error::QueryOverflow { layout_of_depth });
}
fn depth_limit_error(&self, job: QueryJobId);
}