Skip to content

Commit 3f868b1

Browse files
committed
Opacify query invocation.
1 parent 2db2776 commit 3f868b1

File tree

1 file changed

+16
-4
lines changed

1 file changed

+16
-4
lines changed

compiler/rustc_middle/src/ty/query/plumbing.rs

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -450,8 +450,7 @@ macro_rules! define_queries {
450450
Err(lookup) => lookup,
451451
};
452452

453-
let qcx = QueryCtxt(self.tcx);
454-
get_query::<queries::$name<'_>, _>(qcx, DUMMY_SP, key, lookup, QueryMode::Ensure);
453+
self.tcx.queries.$name(self.tcx, DUMMY_SP, key, lookup, QueryMode::Ensure);
455454
})*
456455
}
457456

@@ -542,8 +541,7 @@ macro_rules! define_queries {
542541
Err(lookup) => lookup,
543542
};
544543

545-
let qcx = QueryCtxt(self.tcx);
546-
get_query::<queries::$name<'_>, _>(qcx, self.span, key, lookup, QueryMode::Get).unwrap()
544+
self.tcx.queries.$name(self.tcx, self.span, key, lookup, QueryMode::Get).unwrap()
547545
})*
548546
}
549547

@@ -598,6 +596,20 @@ macro_rules! define_queries_struct {
598596

599597
Some(jobs)
600598
}
599+
600+
$($(#[$attr])*
601+
#[inline(always)]
602+
fn $name(
603+
&self,
604+
tcx: TyCtxt<$tcx>,
605+
span: Span,
606+
key: query_keys::$name<$tcx>,
607+
lookup: QueryLookup,
608+
mode: QueryMode,
609+
) -> Option<query_stored::$name<$tcx>> {
610+
let qcx = QueryCtxt(tcx);
611+
get_query::<queries::$name<$tcx>, _>(qcx, span, key, lookup, mode)
612+
})*
601613
}
602614
};
603615
}

0 commit comments

Comments
 (0)