bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Optimize dep node backtrace and ignore fatal errors

Browse source
This commit is contained in:
John Kåre Alsaker 2023-02-27 05:56:48 +01:00
parent 501ad021b9
commit 8dd0f20ee6
2 changed files with 63 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

23
compiler/rustc_query_system/src/dep_graph/mod.rs
View file

@ -17,8 +17,10 @@ use rustc_data_structures::profiling::SelfProfilerRef;
use rustc_serialize::{opaque::FileEncoder, Encodable};
use rustc_session::Session;
use std::fmt;
use std::hash::Hash;
use std::{fmt, panic};
use self::graph::{print_markframe_trace, DepGraphData, MarkFrame};
pub trait DepContext: Copy {
type DepKind: self::DepKind;
@ -53,11 +55,24 @@ pub trait DepContext: Copy {
}
/// Try to force a dep node to execute and see if it's green.
#[instrument(skip(self), level = "debug")]
fn try_force_from_dep_node(self, dep_node: DepNode<Self::DepKind>) -> bool {
#[inline]
#[instrument(skip(self, graph, frame), level = "debug")]
fn try_force_from_dep_node(
self,
dep_node: DepNode<Self::DepKind>,
graph: &DepGraphData<Self::DepKind>,
frame: Option<&MarkFrame<'_>>,
) -> bool {
let cb = self.dep_kind_info(dep_node.kind);
if let Some(f) = cb.force_from_dep_node {
f(self, dep_node);
if let Err(value) = panic::catch_unwind(panic::AssertUnwindSafe(|| {
f(self, dep_node);
})) {
if !value.is::<rustc_errors::FatalErrorMarker>() {
print_markframe_trace(graph, frame);
}
panic::resume_unwind(value)
}
true
} else {
false