nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-22 06:44:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove $tcx metavariable from rustc_query_append

Browse Source 
It's not actually necessary and it makes the code harder to read.
This commit is contained in:
Joshua Nelson 2022-08-11 19:54:42 -05:00
parent 87991d5f5d
commit b53761969f
6 changed files with 49 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/rustc_macros/src/query.rs
View File

@ -400,10 +400,8 @@ pub fn rustc_queries(input: TokenStream) -> TokenStream {
TokenStream::from(quote! { TokenStream::from(quote! {
#[macro_export] #[macro_export]
macro_rules! rustc_query_append { macro_rules! rustc_query_append {
([$($macro:tt)*][$($other:tt)*]) => { ([$($macro:tt)*]) => {
$($macro)* { $($macro)* {
$($other)*
#query_stream #query_stream
} }
} }

4
compiler/rustc_middle/src/dep_graph/dep_node.rs
View File

@ -143,7 +143,7 @@ impl DepKind {
} }
macro_rules! define_dep_nodes { macro_rules! define_dep_nodes {
(<$tcx:tt> (
$( $(
[$($attrs:tt)*] [$($attrs:tt)*]
$variant:ident $(( $tuple_arg_ty:ty $(,)? ))* $variant:ident $(( $tuple_arg_ty:ty $(,)? ))*
@ -179,7 +179,7 @@ macro_rules! define_dep_nodes {
); );
} }
rustc_dep_node_append!([define_dep_nodes!][ <'tcx> rustc_dep_node_append!([define_dep_nodes!][
// We use this for most things when incr. comp. is turned off. // We use this for most things when incr. comp. is turned off.
[] Null, [] Null,

32
compiler/rustc_middle/src/ty/query.rs
View File

@ -173,7 +173,7 @@ macro_rules! opt_remap_env_constness {
} }
macro_rules! define_callbacks { macro_rules! define_callbacks {
(<$tcx:tt> (
$($(#[$attr:meta])* $($(#[$attr:meta])*
[$($modifiers:tt)*] fn $name:ident($($K:tt)*) -> $V:ty,)*) => { [$($modifiers:tt)*] fn $name:ident($($K:tt)*) -> $V:ty,)*) => {
@ -187,33 +187,33 @@ macro_rules! define_callbacks {
pub mod query_keys { pub mod query_keys {
use super::*; use super::*;
$(pub type $name<$tcx> = $($K)*;)* $(pub type $name<'tcx> = $($K)*;)*
} }
#[allow(nonstandard_style, unused_lifetimes)] #[allow(nonstandard_style, unused_lifetimes)]
pub mod query_values { pub mod query_values {
use super::*; use super::*;
$(pub type $name<$tcx> = $V;)* $(pub type $name<'tcx> = $V;)*
} }
#[allow(nonstandard_style, unused_lifetimes)] #[allow(nonstandard_style, unused_lifetimes)]
pub mod query_storage { pub mod query_storage {
use super::*; use super::*;
$(pub type $name<$tcx> = query_storage!([$($modifiers)*][$($K)*, $V]);)* $(pub type $name<'tcx> = query_storage!([$($modifiers)*][$($K)*, $V]);)*
} }
#[allow(nonstandard_style, unused_lifetimes)] #[allow(nonstandard_style, unused_lifetimes)]
pub mod query_stored { pub mod query_stored {
use super::*; use super::*;
$(pub type $name<$tcx> = <query_storage::$name<$tcx> as QueryStorage>::Stored;)* $(pub type $name<'tcx> = <query_storage::$name<'tcx> as QueryStorage>::Stored;)*
} }
#[derive(Default)] #[derive(Default)]
pub struct QueryCaches<$tcx> { pub struct QueryCaches<'tcx> {
$($(#[$attr])* pub $name: query_storage::$name<$tcx>,)* $($(#[$attr])* pub $name: query_storage::$name<'tcx>,)*
} }
impl<$tcx> TyCtxtEnsure<$tcx> { impl<'tcx> TyCtxtEnsure<'tcx> {
$($(#[$attr])* $($(#[$attr])*
#[inline(always)] #[inline(always)]
pub fn $name(self, key: query_helper_param_ty!($($K)*)) { pub fn $name(self, key: query_helper_param_ty!($($K)*)) {
@ -231,20 +231,20 @@ macro_rules! define_callbacks {
})* })*
} }
impl<$tcx> TyCtxt<$tcx> { impl<'tcx> TyCtxt<'tcx> {
$($(#[$attr])* $($(#[$attr])*
#[inline(always)] #[inline(always)]
#[must_use] #[must_use]
pub fn $name(self, key: query_helper_param_ty!($($K)*)) -> query_stored::$name<$tcx> pub fn $name(self, key: query_helper_param_ty!($($K)*)) -> query_stored::$name<'tcx>
{ {
self.at(DUMMY_SP).$name(key) self.at(DUMMY_SP).$name(key)
})* })*
} }
impl<$tcx> TyCtxtAt<$tcx> { impl<'tcx> TyCtxtAt<'tcx> {
$($(#[$attr])* $($(#[$attr])*
#[inline(always)] #[inline(always)]
pub fn $name(self, key: query_helper_param_ty!($($K)*)) -> query_stored::$name<$tcx> pub fn $name(self, key: query_helper_param_ty!($($K)*)) -> query_stored::$name<'tcx>
{ {
let key = key.into_query_param(); let key = key.into_query_param();
opt_remap_env_constness!([$($modifiers)*][key]); opt_remap_env_constness!([$($modifiers)*][key]);
@ -311,11 +311,11 @@ macro_rules! define_callbacks {
$($(#[$attr])* $($(#[$attr])*
fn $name( fn $name(
&'tcx self, &'tcx self,
tcx: TyCtxt<$tcx>, tcx: TyCtxt<'tcx>,
span: Span, span: Span,
key: query_keys::$name<$tcx>, key: query_keys::$name<'tcx>,
mode: QueryMode, mode: QueryMode,
) -> Option<query_stored::$name<$tcx>>;)* ) -> Option<query_stored::$name<'tcx>>;)*
} }
}; };
} }
@ -332,7 +332,7 @@ macro_rules! define_callbacks {
// Queries marked with `fatal_cycle` do not need the latter implementation, // Queries marked with `fatal_cycle` do not need the latter implementation,
// as they will raise an fatal error on query cycles instead. // as they will raise an fatal error on query cycles instead.
rustc_query_append! { [define_callbacks!][<'tcx>] } rustc_query_append! { [define_callbacks!] }
mod sealed { mod sealed {
use super::{DefId, LocalDefId}; use super::{DefId, LocalDefId};

2
compiler/rustc_query_impl/src/lib.rs
View File

@ -55,7 +55,7 @@ fn describe_as_module(def_id: LocalDefId, tcx: TyCtxt<'_>) -> String {
} }
} }
rustc_query_append! { [define_queries!][<'tcx>] } rustc_query_append! { [define_queries!] }
impl<'tcx> Queries<'tcx> { impl<'tcx> Queries<'tcx> {
// Force codegen in the dyn-trait transformation in this crate. // Force codegen in the dyn-trait transformation in this crate.

58
compiler/rustc_query_impl/src/plumbing.rs
View File

@ -234,11 +234,10 @@ macro_rules! get_provider {
} }
macro_rules! define_queries { macro_rules! define_queries {
(<$tcx:tt> (
$($(#[$attr:meta])* $($(#[$attr:meta])*
[$($modifiers:tt)*] fn $name:ident($($K:tt)*) -> $V:ty,)*) => { [$($modifiers:tt)*] fn $name:ident($($K:tt)*) -> $V:ty,)*) => {
define_queries_struct! { define_queries_struct! {
tcx: $tcx,
input: ($(([$($modifiers)*] [$($attr)*] [$name]))*) input: ($(([$($modifiers)*] [$($attr)*] [$name]))*)
} }
@ -247,7 +246,7 @@ macro_rules! define_queries {
// Create an eponymous constructor for each query. // Create an eponymous constructor for each query.
$(#[allow(nonstandard_style)] $(#[$attr])* $(#[allow(nonstandard_style)] $(#[$attr])*
pub fn $name<$tcx>(tcx: QueryCtxt<$tcx>, key: query_keys::$name<$tcx>) -> QueryStackFrame { pub fn $name<'tcx>(tcx: QueryCtxt<'tcx>, key: query_keys::$name<'tcx>) -> QueryStackFrame {
let kind = dep_graph::DepKind::$name; let kind = dep_graph::DepKind::$name;
let name = stringify!($name); let name = stringify!($name);
// Disable visible paths printing for performance reasons. // Disable visible paths printing for performance reasons.
@ -295,32 +294,32 @@ macro_rules! define_queries {
mod queries { mod queries {
use std::marker::PhantomData; use std::marker::PhantomData;
$(pub struct $name<$tcx> { $(pub struct $name<'tcx> {
data: PhantomData<&$tcx ()> data: PhantomData<&'tcx ()>
})* })*
} }
$(impl<$tcx> QueryConfig for queries::$name<$tcx> { $(impl<'tcx> QueryConfig for queries::$name<'tcx> {
type Key = query_keys::$name<$tcx>; type Key = query_keys::$name<'tcx>;
type Value = query_values::$name<$tcx>; type Value = query_values::$name<'tcx>;
type Stored = query_stored::$name<$tcx>; type Stored = query_stored::$name<'tcx>;
const NAME: &'static str = stringify!($name); const NAME: &'static str = stringify!($name);
} }
impl<$tcx> QueryDescription<QueryCtxt<$tcx>> for queries::$name<$tcx> { impl<'tcx> QueryDescription<QueryCtxt<'tcx>> for queries::$name<'tcx> {
rustc_query_description! { $name<$tcx> } rustc_query_description! { $name<'tcx> }
type Cache = query_storage::$name<$tcx>; type Cache = query_storage::$name<'tcx>;
#[inline(always)] #[inline(always)]
fn query_state<'a>(tcx: QueryCtxt<$tcx>) -> &'a QueryState<Self::Key> fn query_state<'a>(tcx: QueryCtxt<'tcx>) -> &'a QueryState<Self::Key>
where QueryCtxt<$tcx>: 'a where QueryCtxt<'tcx>: 'a
{ {
&tcx.queries.$name &tcx.queries.$name
} }
#[inline(always)] #[inline(always)]
fn query_cache<'a>(tcx: QueryCtxt<$tcx>) -> &'a Self::Cache fn query_cache<'a>(tcx: QueryCtxt<'tcx>) -> &'a Self::Cache
where 'tcx:'a where 'tcx:'a
{ {
&tcx.query_caches.$name &tcx.query_caches.$name
@ -328,7 +327,7 @@ macro_rules! define_queries {
#[inline] #[inline]
fn make_vtable(tcx: QueryCtxt<'tcx>, key: &Self::Key) -> fn make_vtable(tcx: QueryCtxt<'tcx>, key: &Self::Key) ->
QueryVTable<QueryCtxt<$tcx>, Self::Key, Self::Value> QueryVTable<QueryCtxt<'tcx>, Self::Key, Self::Value>
{ {
let compute = get_provider!([$($modifiers)*][tcx, $name, key]); let compute = get_provider!([$($modifiers)*][tcx, $name, key]);
let cache_on_disk = Self::cache_on_disk(tcx.tcx, key); let cache_on_disk = Self::cache_on_disk(tcx.tcx, key);
@ -465,28 +464,25 @@ macro_rules! define_queries {
} }
} }
// FIXME(eddyb) this macro (and others?) use `$tcx` and `'tcx` interchangeably.
// We should either not take `$tcx` at all and use `'tcx` everywhere, or use
// `$tcx` everywhere (even if that isn't necessary due to lack of hygiene).
macro_rules! define_queries_struct { macro_rules! define_queries_struct {
(tcx: $tcx:tt, (
input: ($(([$($modifiers:tt)*] [$($attr:tt)*] [$name:ident]))*)) => { input: ($(([$($modifiers:tt)*] [$($attr:tt)*] [$name:ident]))*)) => {
pub struct Queries<$tcx> { pub struct Queries<'tcx> {
local_providers: Box<Providers>, local_providers: Box<Providers>,
extern_providers: Box<ExternProviders>, extern_providers: Box<ExternProviders>,
pub on_disk_cache: Option<OnDiskCache<$tcx>>, pub on_disk_cache: Option<OnDiskCache<'tcx>>,
jobs: AtomicU64, jobs: AtomicU64,
$($(#[$attr])* $name: QueryState<query_keys::$name<$tcx>>,)* $($(#[$attr])* $name: QueryState<query_keys::$name<'tcx>>,)*
} }
impl<$tcx> Queries<$tcx> { impl<'tcx> Queries<'tcx> {
pub fn new( pub fn new(
local_providers: Providers, local_providers: Providers,
extern_providers: ExternProviders, extern_providers: ExternProviders,
on_disk_cache: Option<OnDiskCache<$tcx>>, on_disk_cache: Option<OnDiskCache<'tcx>>,
) -> Self { ) -> Self {
Queries { Queries {
local_providers: Box::new(local_providers), local_providers: Box::new(local_providers),
@ -498,8 +494,8 @@ macro_rules! define_queries_struct {
} }
pub(crate) fn try_collect_active_jobs( pub(crate) fn try_collect_active_jobs(
&$tcx self, &'tcx self,
tcx: TyCtxt<$tcx>, tcx: TyCtxt<'tcx>,
) -> Option<QueryMap> { ) -> Option<QueryMap> {
let tcx = QueryCtxt { tcx, queries: self }; let tcx = QueryCtxt { tcx, queries: self };
let mut jobs = QueryMap::default(); let mut jobs = QueryMap::default();
@ -532,13 +528,13 @@ macro_rules! define_queries_struct {
#[tracing::instrument(level = "trace", skip(self, tcx))] #[tracing::instrument(level = "trace", skip(self, tcx))]
fn $name( fn $name(
&'tcx self, &'tcx self,
tcx: TyCtxt<$tcx>, tcx: TyCtxt<'tcx>,
span: Span, span: Span,
key: query_keys::$name<$tcx>, key: query_keys::$name<'tcx>,
mode: QueryMode, mode: QueryMode,
) -> Option<query_stored::$name<$tcx>> { ) -> Option<query_stored::$name<'tcx>> {
let qcx = QueryCtxt { tcx, queries: self }; let qcx = QueryCtxt { tcx, queries: self };
get_query::<queries::$name<$tcx>, _>(qcx, span, key, mode) get_query::<queries::$name<'tcx>, _>(qcx, span, key, mode)
})* })*
} }
}; };

4
compiler/rustc_query_impl/src/profiling_support.rs
View File

@ -306,7 +306,7 @@ pub fn alloc_self_profile_query_strings(tcx: TyCtxt<'_>) {
let mut string_cache = QueryKeyStringCache::new(); let mut string_cache = QueryKeyStringCache::new();
macro_rules! alloc_once { macro_rules! alloc_once {
(<$tcx:tt> (
$($(#[$attr:meta])* [$($modifiers:tt)*] fn $name:ident($K:ty) -> $V:ty,)* $($(#[$attr:meta])* [$($modifiers:tt)*] fn $name:ident($K:ty) -> $V:ty,)*
) => { ) => {
$({ $({
@ -320,5 +320,5 @@ pub fn alloc_self_profile_query_strings(tcx: TyCtxt<'_>) {
} }
} }
rustc_query_append! { [alloc_once!][<'tcx>] } rustc_query_append! { [alloc_once!] }
} }