bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Prevent potential bug resulting from changing crate_hash query name

Browse source
This commit is contained in:
Tyson Nottingham 2021-01-11 13:31:43 -08:00
parent 0962e5eba9
commit 8e7cbc28a6
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
compiler/rustc_metadata/src/rmeta/decoder/cstore_impl.rs
View file

@ -47,7 +47,8 @@ macro_rules! provide {
// External query providers call `crate_hash` in order to register a dependency // External query providers call `crate_hash` in order to register a dependency
// on the crate metadata. The exception is `crate_hash` itself, which obviously // on the crate metadata. The exception is `crate_hash` itself, which obviously
// doesn't need to do this (and can't, as it would cause a query cycle). // doesn't need to do this (and can't, as it would cause a query cycle).
if stringify!($name) != "crate_hash" && $tcx.dep_graph.is_fully_enabled() { use rustc_middle::dep_graph::DepKind;
if DepKind::$name != DepKind::crate_hash && $tcx.dep_graph.is_fully_enabled() {
$tcx.ensure().crate_hash($def_id.krate); $tcx.ensure().crate_hash($def_id.krate);
} }

2
compiler/rustc_middle/src/query/mod.rs
View file

@ -1220,6 +1220,8 @@ rustc_queries! {
eval_always eval_always
desc { "looking up the disambiguator a crate" } desc { "looking up the disambiguator a crate" }
} }
// The macro which defines `rustc_metadata::provide_extern` depends on this query's name.
// Changing the name should cause a compiler error, but in case that changes, be aware.
query crate_hash(_: CrateNum) -> Svh { query crate_hash(_: CrateNum) -> Svh {
eval_always eval_always
desc { "looking up the hash a crate" } desc { "looking up the hash a crate" }