bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Make hash_result an Option.

Browse source
This commit is contained in:
Camille GILLOT 2021-10-16 22:31:48 +02:00
parent e53404cca6
commit aa404c24dd
7 changed files with 39 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

18
compiler/rustc_query_impl/src/plumbing.rs
View file

@ -291,14 +291,14 @@ macro_rules! is_eval_always {
}
macro_rules! hash_result {
([][$hcx:expr, $result:expr]) => {{
dep_graph::hash_result($hcx, &$result)
([]) => {{
Some(dep_graph::hash_result)
}};
([(no_hash) $($rest:tt)*][$hcx:expr, $result:expr]) => {{
([(no_hash) $($rest:tt)*]) => {{
None
}};
([$other:tt $($modifiers:tt)*][$($args:tt)*]) => {
hash_result!([$($modifiers)*][$($args)*])
([$other:tt $($modifiers:tt)*]) => {
hash_result!([$($modifiers)*])
};
}
@ -378,6 +378,7 @@ macro_rules! define_queries {
const ANON: bool = is_anon!([$($modifiers)*]);
const EVAL_ALWAYS: bool = is_eval_always!([$($modifiers)*]);
const DEP_KIND: dep_graph::DepKind = dep_graph::DepKind::$name;
const HASH_RESULT: Option<fn(&mut StableHashingContext<'_>, &Self::Value) -> Fingerprint> = hash_result!([$($modifiers)*]);
type Cache = query_storage::$name<$tcx>;
@ -406,13 +407,6 @@ macro_rules! define_queries {
}
}
fn hash_result(
_hcx: &mut StableHashingContext<'_>,
_result: &Self::Value
) -> Option<Fingerprint> {
hash_result!([$($modifiers)*][_hcx, _result])
}
fn handle_cycle_error(
tcx: QueryCtxt<'tcx>,
mut error: DiagnosticBuilder<'_>,