bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Introduce query_storage.

Browse source
This commit is contained in:
Camille GILLOT 2021-01-19 20:02:05 +01:00
parent 4b42a6d90b
commit f8ab649dfd
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
compiler/rustc_middle/src/ty/query/plumbing.rs
View file

@ -343,13 +343,16 @@ macro_rules! define_queries {
$(pub type $name<$tcx> = $V;)* $(pub type $name<$tcx> = $V;)*
} }
#[allow(nonstandard_style, unused_lifetimes)] #[allow(nonstandard_style, unused_lifetimes)]
pub mod query_storage {
use super::*;
$(pub type $name<$tcx> = query_storage!([$($modifiers)*][$($K)*, $V]);)*
}
#[allow(nonstandard_style, unused_lifetimes)]
pub mod query_stored { pub mod query_stored {
use super::*; use super::*;
$(pub type $name<$tcx> = < $(pub type $name<$tcx> = <query_storage::$name<$tcx> as QueryStorage>::Stored;)*
query_storage!([$($modifiers)*][$($K)*, $V])
as QueryStorage
>::Stored;)*
} }
$(impl<$tcx> QueryConfig for queries::$name<$tcx> { $(impl<$tcx> QueryConfig for queries::$name<$tcx> {
@ -364,7 +367,7 @@ macro_rules! define_queries {
const EVAL_ALWAYS: bool = is_eval_always!([$($modifiers)*]); const EVAL_ALWAYS: bool = is_eval_always!([$($modifiers)*]);
const DEP_KIND: dep_graph::DepKind = dep_graph::DepKind::$name; const DEP_KIND: dep_graph::DepKind = dep_graph::DepKind::$name;
type Cache = query_storage!([$($modifiers)*][$($K)*, $V]); type Cache = query_storage::$name<$tcx>;
#[inline(always)] #[inline(always)]
fn query_state<'a>(tcx: TyCtxt<$tcx>) -> &'a QueryState<crate::dep_graph::DepKind, <TyCtxt<$tcx> as QueryContext>::Query, Self::Cache> { fn query_state<'a>(tcx: TyCtxt<$tcx>) -> &'a QueryState<crate::dep_graph::DepKind, <TyCtxt<$tcx> as QueryContext>::Query, Self::Cache> {
@ -523,7 +526,7 @@ macro_rules! define_queries_struct {
$($(#[$attr])* $name: QueryState< $($(#[$attr])* $name: QueryState<
crate::dep_graph::DepKind, crate::dep_graph::DepKind,
<TyCtxt<$tcx> as QueryContext>::Query, <TyCtxt<$tcx> as QueryContext>::Query,
<queries::$name<$tcx> as QueryAccessors<TyCtxt<'tcx>>>::Cache, query_storage::$name<$tcx>,
>,)* >,)*
} }