bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Remove force_ex!.

Browse source
This commit is contained in:
Nicholas Nethercote 2019-10-07 11:59:28 +11:00
parent 1183d60cd5
commit 9267d9fe5b
2 changed files with 10 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/librustc/ty/query/plumbing.rs
View file

@ -1191,18 +1191,6 @@ pub fn force_from_dep_node(tcx: TyCtxt<'_>, dep_node: &DepNode) -> bool {
return false
}
macro_rules! force_ex {
($tcx:expr, $query:ident, $key:expr) => {
{
$tcx.force_query::<crate::ty::query::queries::$query<'_>>(
$key,
DUMMY_SP,
*dep_node
);
}
}
};
rustc_dep_node_force!([dep_node, tcx]
// These are inputs that are expected to be pre-allocated and that
// should therefore always be red or green already.
@ -1228,7 +1216,11 @@ pub fn force_from_dep_node(tcx: TyCtxt<'_>, dep_node: &DepNode) -> bool {
// Return from the whole function.
return false
};
force_ex!(tcx, analysis, def_id.krate);
tcx.force_query::<crate::ty::query::queries::analysis<'_>>(
def_id.krate,
DUMMY_SP,
*dep_node
);
}
);

6
src/librustc_macros/src/query.rs
View file

@ -495,7 +495,11 @@ pub fn rustc_queries(input: TokenStream) -> TokenStream {
dep_node_force_stream.extend(quote! {
DepKind::#name => {
if let Some(key) = RecoverKey::recover($tcx, $dep_node) {
force_ex!($tcx, #name, key);
$tcx.force_query::<crate::ty::query::queries::#name<'_>>(
key,
DUMMY_SP,
*$dep_node
);
} else {
return false;
}