From 6d99dd91895f9dafbaa08d1ada7782d884089503 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20K=C3=A5re=20Alsaker?= Date: Sun, 26 Mar 2023 12:24:44 +0200 Subject: [PATCH] Address comments --- compiler/rustc_middle/src/query/erase.rs | 4 +++- compiler/rustc_query_impl/src/lib.rs | 9 ++++----- compiler/rustc_query_impl/src/on_disk_cache.rs | 7 +++---- compiler/rustc_query_impl/src/plumbing.rs | 17 +++++------------ compiler/rustc_query_system/src/query/config.rs | 3 ++- .../rustc_query_system/src/query/plumbing.rs | 4 ++-- 6 files changed, 19 insertions(+), 25 deletions(-) diff --git a/compiler/rustc_middle/src/query/erase.rs b/compiler/rustc_middle/src/query/erase.rs index 131f91c2887..86532f4f264 100644 --- a/compiler/rustc_middle/src/query/erase.rs +++ b/compiler/rustc_middle/src/query/erase.rs @@ -3,6 +3,8 @@ use std::mem::{size_of, transmute_copy, MaybeUninit}; #[derive(Copy, Clone)] pub struct Erased { + // We use `MaybeUninit` here so we can store any value + // in `data` since we aren't actually storing a `T`. data: MaybeUninit, } @@ -12,7 +14,7 @@ pub trait EraseType: Copy { // Allow `type_alias_bounds` since compilation will fail without `EraseType`. #[allow(type_alias_bounds)] -pub type Erase = Erased; +pub type Erase = Erased; #[inline(always)] pub fn erase(src: T) -> Erase { diff --git a/compiler/rustc_query_impl/src/lib.rs b/compiler/rustc_query_impl/src/lib.rs index 7e053735aa9..7001a1eed57 100644 --- a/compiler/rustc_query_impl/src/lib.rs +++ b/compiler/rustc_query_impl/src/lib.rs @@ -45,12 +45,11 @@ pub use on_disk_cache::OnDiskCache; mod profiling_support; pub use self::profiling_support::alloc_self_profile_query_strings; -trait QueryToConfig<'tcx>: 'tcx { - type Value; - type Config: QueryConfig>; +/// This is implemented per query and restoring query values from their erased state. +trait QueryConfigRestored<'tcx>: QueryConfig> + Default { + type RestoredValue; - fn config(qcx: QueryCtxt<'tcx>) -> Self::Config; - fn restore(value: >>::Value) -> Self::Value; + fn restore(value: >>::Value) -> Self::RestoredValue; } rustc_query_append! { define_queries! } diff --git a/compiler/rustc_query_impl/src/on_disk_cache.rs b/compiler/rustc_query_impl/src/on_disk_cache.rs index 4d64517d4a3..eec9dac7b9b 100644 --- a/compiler/rustc_query_impl/src/on_disk_cache.rs +++ b/compiler/rustc_query_impl/src/on_disk_cache.rs @@ -13,7 +13,6 @@ use rustc_middle::mir::{self, interpret}; use rustc_middle::ty::codec::{RefDecodable, TyDecoder, TyEncoder}; use rustc_middle::ty::{self, Ty, TyCtxt}; use rustc_query_system::dep_graph::DepContext; -use rustc_query_system::query::QueryConfig; use rustc_query_system::query::{QueryCache, QuerySideEffects}; use rustc_serialize::{ opaque::{FileEncodeResult, FileEncoder, IntEncodedWithFixedSize, MemDecoder}, @@ -1066,13 +1065,13 @@ impl<'a, 'tcx> Encodable> for [u8] { } pub(crate) fn encode_query_results<'a, 'tcx, Q>( - query: Q::Config, + query: Q, qcx: QueryCtxt<'tcx>, encoder: &mut CacheEncoder<'a, 'tcx>, query_result_index: &mut EncodedDepNodeIndex, ) where - Q: super::QueryToConfig<'tcx>, - Q::Value: Encodable>, + Q: super::QueryConfigRestored<'tcx>, + Q::RestoredValue: Encodable>, { let _timer = qcx .tcx diff --git a/compiler/rustc_query_impl/src/plumbing.rs b/compiler/rustc_query_impl/src/plumbing.rs index a1dfb27c5d7..afbead7d1ae 100644 --- a/compiler/rustc_query_impl/src/plumbing.rs +++ b/compiler/rustc_query_impl/src/plumbing.rs @@ -564,7 +564,7 @@ macro_rules! define_queries { } #[inline] - fn from_cycle_error( + fn value_from_cycle_error( self, tcx: TyCtxt<'tcx>, cycle: &[QueryInfo], @@ -609,17 +609,11 @@ macro_rules! define_queries { } })* - $(impl<'tcx> QueryToConfig<'tcx> for queries::$name<'tcx> { - type Value = query_values::$name<'tcx>; - type Config = Self; + $(impl<'tcx> QueryConfigRestored<'tcx> for queries::$name<'tcx> { + type RestoredValue = query_values::$name<'tcx>; #[inline(always)] - fn config(_qcx: QueryCtxt<'tcx>) -> Self::Config { - Self::default() - } - - #[inline(always)] - fn restore(value: >>::Value) -> Self::Value { + fn restore(value: >>::Value) -> Self::RestoredValue { restore::>(value) } })* @@ -695,7 +689,6 @@ macro_rules! define_queries { use $crate::profiling_support::QueryKeyStringCache; use rustc_query_system::query::QueryMap; use rustc_middle::dep_graph::DepKind; - use crate::QueryToConfig; pub(super) const fn dummy_query_struct<'tcx>() -> QueryStruct<'tcx> { fn noop_try_collect_active_jobs(_: QueryCtxt<'_>, _: &mut QueryMap) -> Option<()> { @@ -740,7 +733,7 @@ macro_rules! define_queries { }, encode_query_results: expand_if_cached!([$($modifiers)*], |qcx, encoder, query_result_index| $crate::on_disk_cache::encode_query_results::>( - super::queries::$name::config(qcx), + super::queries::$name::default(), qcx, encoder, query_result_index, diff --git a/compiler/rustc_query_system/src/query/config.rs b/compiler/rustc_query_system/src/query/config.rs index dc981a802f3..c8d77938510 100644 --- a/compiler/rustc_query_system/src/query/config.rs +++ b/compiler/rustc_query_system/src/query/config.rs @@ -47,7 +47,8 @@ pub trait QueryConfig: Copy { fn loadable_from_disk(self, qcx: Qcx, key: &Self::Key, idx: SerializedDepNodeIndex) -> bool; - fn from_cycle_error( + /// Synthesize an error value to let compilation continue after a cycle. + fn value_from_cycle_error( self, tcx: Qcx::DepContext, cycle: &[QueryInfo], diff --git a/compiler/rustc_query_system/src/query/plumbing.rs b/compiler/rustc_query_system/src/query/plumbing.rs index 95366e1ad0b..20310483d7e 100644 --- a/compiler/rustc_query_system/src/query/plumbing.rs +++ b/compiler/rustc_query_system/src/query/plumbing.rs @@ -148,7 +148,7 @@ where match handler { Error => { error.emit(); - query.from_cycle_error(*qcx.dep_context(), &cycle_error.cycle) + query.value_from_cycle_error(*qcx.dep_context(), &cycle_error.cycle) } Fatal => { error.emit(); @@ -157,7 +157,7 @@ where } DelayBug => { error.delay_as_bug(); - query.from_cycle_error(*qcx.dep_context(), &cycle_error.cycle) + query.value_from_cycle_error(*qcx.dep_context(), &cycle_error.cycle) } } }