mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #77006 - oli-obk:🐌_const_queries, r=Mark-Simulacrum

Browse Source 
Cache `eval_to_allocation_raw` on disk

https://github.com/rust-lang/rust/pull/74949#issuecomment-695833161 regressed the performance on these queries, this PR gets the perf back.
This commit is contained in:
bors 2020-09-24 15:12:17 +00:00
commit 87d262acb5
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/rustc_middle/src/mir/interpret/value.rs
View File

@ -13,7 +13,7 @@
use super::{sign_extend, truncate, AllocId, Allocation, InterpResult, Pointer, PointerArithmetic}; use super::{sign_extend, truncate, AllocId, Allocation, InterpResult, Pointer, PointerArithmetic};
/// Represents the result of const evaluation via the `eval_to_allocation` query. /// Represents the result of const evaluation via the `eval_to_allocation` query.
#[derive(Clone, HashStable)] #[derive(Clone, HashStable, TyEncodable, TyDecodable)]
pub struct ConstAlloc<'tcx> { pub struct ConstAlloc<'tcx> {
// the value lives here, at offset 0, and that allocation definitely is a `AllocKind::Memory` // the value lives here, at offset 0, and that allocation definitely is a `AllocKind::Memory`
// (so you can use `AllocMap::unwrap_memory`). // (so you can use `AllocMap::unwrap_memory`).

6
compiler/rustc_middle/src/query/mod.rs
View File

@ -716,6 +716,7 @@ fn describe_as_module(def_id: LocalDefId, tcx: TyCtxt<'_>) -> String {
"const-evaluating + checking `{}`", "const-evaluating + checking `{}`",
key.value.display(tcx) key.value.display(tcx)
} }
cache_on_disk_if { true }
} }
/// Evaluates const items or anonymous constants /// Evaluates const items or anonymous constants
@ -730,10 +731,7 @@ fn describe_as_module(def_id: LocalDefId, tcx: TyCtxt<'_>) -> String {
"simplifying constant for the type system `{}`", "simplifying constant for the type system `{}`",
key.value.display(tcx) key.value.display(tcx)
} }
cache_on_disk_if(_, opt_result) { cache_on_disk_if { true }
// Only store results without errors
opt_result.map_or(true, |r| r.is_ok())
}
} }
/// Destructure a constant ADT or array into its variant index and its /// Destructure a constant ADT or array into its variant index and its