user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

incr.comp.: Make assertion in try_mark_green() more targeted.

Browse source
This commit is contained in:
Michael Woerister 2017-11-07 15:04:10 +01:00
parent 667477392b
commit a174951272
1 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/librustc/dep_graph/graph.rs
View file

@ -519,6 +519,20 @@ impl DepGraph {
current_deps.push(node_index);
continue;
}
} else if cfg!(debug_assertions) {
match dep_dep_node.kind {
DepKind::Hir |
DepKind::HirBody |
DepKind::CrateMetadata => {
assert!(dep_dep_node.extract_def_id(tcx).is_none(),
"Input {:?} should have been pre-allocated but wasn't.",
dep_dep_node);
}
_ => {
// For other kinds of inputs it's OK to be
// forced.
}
}
}
// We failed to mark it green, so we try to force the query.
@ -549,10 +563,6 @@ impl DepGraph {
}
}
} else {
debug_assert!(!dep_dep_node.kind.is_input() ||
dep_dep_node.extract_def_id(tcx).is_none(),
"Could not force input that should still exist.");
// The DepNode could not be forced.
debug!("try_mark_green({:?}) - END - dependency {:?} \
could not be forced", dep_node, dep_dep_node);