bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rename incremental_verify_ich_cold to incremental_verify_ich_failed

Browse source
This commit is contained in:
Nilstrieb 2022-11-05 20:26:41 +01:00
parent df3187260f
commit 3da576804a
No known key found for this signature in database
1 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
compiler/rustc_query_system/src/query/plumbing.rs
View file

@ -585,7 +585,11 @@ fn incremental_verify_ich<CTX, K, V: Debug>(
debug!("END verify_ich({:?})", dep_node); debug!("END verify_ich({:?})", dep_node);
if Some(new_hash) != old_hash { if Some(new_hash) != old_hash {
incremental_verify_ich_cold(tcx.sess(), DebugArg::from(&dep_node), DebugArg::from(&result)); incremental_verify_ich_failed(
tcx.sess(),
DebugArg::from(&dep_node),
DebugArg::from(&result),
);
} }
} }
@ -631,13 +635,7 @@ impl std::fmt::Debug for DebugArg<'_> {
// different implementations for LLVM to chew on (and filling up the final // different implementations for LLVM to chew on (and filling up the final
// binary, too). // binary, too).
#[cold] #[cold]
fn incremental_verify_ich_cold(sess: &Session, dep_node: DebugArg<'_>, result: DebugArg<'_>) { fn incremental_verify_ich_failed(sess: &Session, dep_node: DebugArg<'_>, result: DebugArg<'_>) {
let run_cmd = if let Some(crate_name) = &sess.opts.crate_name {
format!("`cargo clean -p {}` or `cargo clean`", crate_name)
} else {
"`cargo clean`".to_string()
};
// When we emit an error message and panic, we try to debug-print the `DepNode` // When we emit an error message and panic, we try to debug-print the `DepNode`
// and query result. Unfortunately, this can cause us to run additional queries, // and query result. Unfortunately, this can cause us to run additional queries,
// which may result in another fingerprint mismatch while we're in the middle // which may result in another fingerprint mismatch while we're in the middle
@ -653,6 +651,12 @@ fn incremental_verify_ich_cold(sess: &Session, dep_node: DebugArg<'_>, result: D
if old_in_panic { if old_in_panic {
sess.emit_err(crate::error::Reentrant); sess.emit_err(crate::error::Reentrant);
} else { } else {
let run_cmd = if let Some(crate_name) = &sess.opts.crate_name {
format!("`cargo clean -p {}` or `cargo clean`", crate_name)
} else {
"`cargo clean`".to_string()
};
sess.emit_err(crate::error::IncrementCompilation { sess.emit_err(crate::error::IncrementCompilation {
run_cmd, run_cmd,
dep_node: format!("{:?}", dep_node), dep_node: format!("{:?}", dep_node),