@@ -472,7 +472,6 @@ impl<K: DepKind> DepGraph<K> {
472
472
parent_dep_node_index : SerializedDepNodeIndex ,
473
473
dep_node : & DepNode < K > ,
474
474
) -> Option < ( ) > {
475
- let dep_dep_node = & data. previous . read ( ) . index_to_node ( parent_dep_node_index) ;
476
475
let dep_dep_node_color = data. previous . read ( ) . color_or_edges ( parent_dep_node_index) ;
477
476
let prev_deps = match dep_dep_node_color {
478
477
Ok ( DepNodeColor :: Green ) => {
@@ -481,7 +480,8 @@ impl<K: DepKind> DepGraph<K> {
481
480
// dependencies.
482
481
debug ! (
483
482
"try_mark_parent_green({:?}) --- found dependency {:?} to be immediately green" ,
484
- dep_node, dep_dep_node,
483
+ dep_node,
484
+ data. previous. read( ) . index_to_node( parent_dep_node_index)
485
485
) ;
486
486
return Some ( ( ) ) ;
487
487
}
@@ -492,7 +492,8 @@ impl<K: DepKind> DepGraph<K> {
492
492
// with checking any of the other dependencies.
493
493
debug ! (
494
494
"try_mark_parent_green({:?}) - END - dependency {:?} was immediately red" ,
495
- dep_node, dep_dep_node,
495
+ dep_node,
496
+ data. previous. read( ) . index_to_node( parent_dep_node_index)
496
497
) ;
497
498
return None ;
498
499
}
@@ -502,11 +503,16 @@ impl<K: DepKind> DepGraph<K> {
502
503
// We don't know the state of this dependency. If it isn't
503
504
// an eval_always node, let's try to mark it green recursively.
504
505
debug ! (
505
- "try_mark_parent_green({:?}) --- state of dependency {:?} ({}) \
506
+ "try_mark_parent_green({:?}) --- state of dependency {:?} \
506
507
is unknown, trying to mark it green",
507
- dep_node, dep_dep_node, dep_dep_node. hash,
508
+ dep_node,
509
+ {
510
+ let dep_dep_node = data. previous. read( ) . index_to_node( parent_dep_node_index) ;
511
+ ( dep_dep_node, dep_dep_node. hash)
512
+ }
508
513
) ;
509
514
515
+ let dep_dep_node = & data. previous . read ( ) . index_to_node ( parent_dep_node_index) ;
510
516
let node_index =
511
517
self . try_mark_previous_green ( tcx, data, parent_dep_node_index, prev_deps, dep_dep_node) ;
512
518
if node_index. is_some ( ) {
0 commit comments