Mirrors/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2026-04-27 18:57:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #147293 - nnethercote:avoid-dep_dep_node, r=saethlin

Browse Source 
Avoid getting `dep_dep_node` unnecessarily.

It's gotten on a hot path but only for use within `debug!`.

r? `@saethlin`
This commit is contained in:
bors
2025-10-04 21:23:46 +00:00
parent 2cb4e7dce8 3a287e6034
commit 227ac7c3cd
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/rustc_query_system/src/dep_graph/graph.rs
+11 -8
View File
@@ -875,15 +875,18 @@ fn try_mark_parent_green<Qcx: QueryContext<Deps = D>>(
parent_dep_node_index: SerializedDepNodeIndex,
frame: Option<&MarkFrame<'_>>,
) -> Option<()> {
let dep_dep_node_color = self.colors.get(parent_dep_node_index);
let dep_dep_node = &self.previous.index_to_node(parent_dep_node_index);
let get_dep_dep_node = || self.previous.index_to_node(parent_dep_node_index);
match dep_dep_node_color {
match self.colors.get(parent_dep_node_index) {
Some(DepNodeColor::Green(_)) => {
// This dependency has been marked as green before, we are
// still fine and can continue with checking the other
// dependencies.
debug!("dependency {dep_dep_node:?} was immediately green");
//
// This path is extremely hot. We don't want to get the
// `dep_dep_node` unless it's necessary. Hence the
// `get_dep_dep_node` closure.
debug!("dependency {:?} was immediately green", get_dep_dep_node());
return Some(());
}
Some(DepNodeColor::Red) => {
@@ -891,12 +894,14 @@ fn try_mark_parent_green<Qcx: QueryContext<Deps = D>>(
// compared to the previous compilation session. We cannot
// mark the DepNode as green and also don't need to bother
// with checking any of the other dependencies.
debug!("dependency {dep_dep_node:?} was immediately red");
debug!("dependency {:?} was immediately red", get_dep_dep_node());
return None;
}
None => {}
}
let dep_dep_node = &get_dep_dep_node();
// We don't know the state of this dependency. If it isn't
// an eval_always node, let's try to mark it green recursively.
if !qcx.dep_context().is_eval_always(dep_dep_node.kind) {
@@ -922,9 +927,7 @@ fn try_mark_parent_green<Qcx: QueryContext<Deps = D>>(
return None;
}
let dep_dep_node_color = self.colors.get(parent_dep_node_index);
match dep_dep_node_color {
match self.colors.get(parent_dep_node_index) {
Some(DepNodeColor::Green(_)) => {
debug!("managed to FORCE dependency {dep_dep_node:?} to green");
return Some(());