bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Add a temporary hack before env fix lands in bootstrap

Browse source
This commit is contained in:
Deadbeef 2021-12-17 14:16:12 +08:00
parent 6b5f63c3fc
commit 2f555dec4a
No known key found for this signature in database
GPG key ID: 6D017A96D8E6C2F9
1 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -771,11 +771,24 @@ rustc_queries! {
desc { |tcx| "type-checking `{}`", tcx.def_path_str(key.to_def_id()) } desc { |tcx| "type-checking `{}`", tcx.def_path_str(key.to_def_id()) }
cache_on_disk_if { true } cache_on_disk_if { true }
load_cached(tcx, id) { load_cached(tcx, id) {
let typeck_results: Option<ty::TypeckResults<'tcx>> = tcx #[cfg(bootstrap)]
.on_disk_cache().as_ref() {
.and_then(|c| c.try_load_query_result(*tcx, id)); match match tcx.on_disk_cache().as_ref() {
Some(c) => c.try_load_query_result(*tcx, id),
None => None,
} {
Some(x) => Some(&*tcx.arena.alloc(x)),
None => None,
}
}
#[cfg(not(bootstrap))]
{
let typeck_results: Option<ty::TypeckResults<'tcx>> = tcx
.on_disk_cache().as_ref()
.and_then(|c| c.try_load_query_result(*tcx, id));
typeck_results.map(|x| &*tcx.arena.alloc(x)) typeck_results.map(|x| &*tcx.arena.alloc(x))
}
} }
} }