Skip to content

Removed the wrapper around call_query(). #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 14, 2020
Merged

Removed the wrapper around call_query(). #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion compiler/rustc_macros/src/query.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,7 @@ pub fn rustc_queries(input: TokenStream) -> TokenStream {
::rustc_middle::dep_graph::DepKind::#name => {
if <#arg as DepNodeParams<TyCtxt<'_>>>::can_reconstruct_query_key() {
if let Some(key) = <#arg as DepNodeParams<TyCtxt<'_>>>::recover($tcx, $dep_node) {
crate::ty::query::queries::#name::query(
call_query::<crate::ty::query::queries::#name<'_>, _>(
$tcx,
DUMMY_SP,
key,
Expand Down
17 changes: 2 additions & 15 deletions compiler/rustc_middle/src/ty/query/plumbing.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,19 +394,6 @@ macro_rules! define_queries_inner {
) -> Self::Value {
handle_cycle_error!([$($modifiers)*][tcx, error])
}
}

impl queries::$name<$tcx> {
$(#[$attr])*
#[inline(always)]
pub fn query(
tcx: TyCtxt<$tcx>,
span: Span,
key: query_keys::$name<$tcx>,
caller: QueryCaller<DepKind>,
) -> Option<<queries::$name<$tcx> as QueryConfig<TyCtxt<$tcx>>>::Stored> {
call_query::<queries::$name<'_>, _>(tcx, span, key, caller)
}
})*

#[derive(Copy, Clone)]
Expand All @@ -418,7 +405,7 @@ macro_rules! define_queries_inner {
$($(#[$attr])*
#[inline(always)]
pub fn $name(self, key: query_helper_param_ty!($($K)*)) {
queries::$name::query(
call_query::<queries::$name<'_>, _>(
self.tcx,
DUMMY_SP,
key.into_query_param(),
Expand Down Expand Up @@ -506,7 +493,7 @@ macro_rules! define_queries_inner {
pub fn $name(self, key: query_helper_param_ty!($($K)*))
-> <queries::$name<$tcx> as QueryConfig<TyCtxt<$tcx>>>::Stored
{
let ret = queries::$name::query(
let ret = call_query::<queries::$name<'_>, _>(
self.tcx,
self.span,
key.into_query_param(),
Expand Down