bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Don't allow evaluating queries that were fed in a previous compiler run

Browse source
This commit is contained in:
Oli Scherer 2023-02-14 14:06:08 +00:00
parent f4f5fc3e5c
commit b4182d240a
1 changed files with 6 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -19,7 +19,6 @@ use rustc_data_structures::sync::Lock;
use rustc_errors::{DiagnosticBuilder, ErrorGuaranteed, FatalError}; use rustc_errors::{DiagnosticBuilder, ErrorGuaranteed, FatalError};
use rustc_session::Session; use rustc_session::Session;
use rustc_span::{Span, DUMMY_SP}; use rustc_span::{Span, DUMMY_SP};
use std::borrow::Borrow;
use std::cell::Cell; use std::cell::Cell;
use std::collections::hash_map::Entry; use std::collections::hash_map::Entry;
use std::fmt::Debug; use std::fmt::Debug;
@ -364,25 +363,13 @@ where
let (result, dep_node_index) = let (result, dep_node_index) =
execute_job::<Q, Qcx>(qcx, key.clone(), dep_node, job.id); execute_job::<Q, Qcx>(qcx, key.clone(), dep_node, job.id);
if Q::FEEDABLE { if Q::FEEDABLE {
// We may have put a value inside the cache from inside the execution. // We should not compute queries that also got a value via feeding.
// Verify that it has the same hash as what we have now, to ensure consistency. // This can't happen, as query feeding adds the very dependencies to the fed query
// as its feeding query had. So if the fed query is red, so is its feeder, which will
// get evaluated first, and re-feed the query.
if let Some((cached_result, _)) = cache.lookup(&key) { if let Some((cached_result, _)) = cache.lookup(&key) {
let hasher = Q::HASH_RESULT.expect("feedable forbids no_hash"); panic!(
"fed query later has its value computed. The already cached value: {cached_result:?}"
let old_hash = qcx.dep_context().with_stable_hashing_context(|mut hcx| {
hasher(&mut hcx, cached_result.borrow())
});
let new_hash = qcx
.dep_context()
.with_stable_hashing_context(|mut hcx| hasher(&mut hcx, &result));
debug_assert_eq!(
old_hash,
new_hash,
"Computed query value for {:?}({:?}) is inconsistent with fed value,\ncomputed={:#?}\nfed={:#?}",
Q::DEP_KIND,
key,
result,
cached_result,
); );
} }
} }