forked from rust-lang/rust
-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Auto merge of rust-lang#114492 - compiler-errors:rollup-lp4sfla, r=co…
…mpiler-errors Rollup of 5 pull requests Successful merges: - rust-lang#114287 (update overflow handling in the new trait solver) - rust-lang#114475 (Migrate GUI colors test to original CSS color format) - rust-lang#114482 (Fix ui-fulldeps missing the `internal_features` lint on stage 0) - rust-lang#114490 (Fix a typo in the error reporting for sealed traits.) - rust-lang#114491 (Rename issue rust-lang#114423 test files to include context) r? `@ghost` `@rustbot` modify labels: rollup
- Loading branch information
Showing
32 changed files
with
770 additions
and
586 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,100 @@ | ||
| use super::{CanonicalInput, QueryResult}; | ||
| use crate::ty::TyCtxt; | ||
| use rustc_data_structures::fx::{FxHashMap, FxHashSet}; | ||
| use rustc_data_structures::sync::Lock; | ||
| use rustc_query_system::cache::WithDepNode; | ||
| use rustc_query_system::dep_graph::DepNodeIndex; | ||
| use rustc_session::Limit; | ||
| /// The trait solver cache used by `-Ztrait-solver=next`. | ||
| /// | ||
| /// FIXME(@lcnr): link to some official documentation of how | ||
| /// this works. | ||
| #[derive(Default)] | ||
| pub struct EvaluationCache<'tcx> { | ||
| map: Lock<FxHashMap<CanonicalInput<'tcx>, CacheEntry<'tcx>>>, | ||
| } | ||
|
|
||
| pub struct CacheData<'tcx> { | ||
| pub result: QueryResult<'tcx>, | ||
| pub reached_depth: usize, | ||
| pub encountered_overflow: bool, | ||
| } | ||
|
|
||
| impl<'tcx> EvaluationCache<'tcx> { | ||
| /// Insert a final result into the global cache. | ||
| pub fn insert( | ||
| &self, | ||
| key: CanonicalInput<'tcx>, | ||
| reached_depth: usize, | ||
| did_overflow: bool, | ||
| cycle_participants: FxHashSet<CanonicalInput<'tcx>>, | ||
| dep_node: DepNodeIndex, | ||
| result: QueryResult<'tcx>, | ||
| ) { | ||
| let mut map = self.map.borrow_mut(); | ||
| let entry = map.entry(key).or_default(); | ||
| let data = WithDepNode::new(dep_node, result); | ||
| entry.cycle_participants.extend(cycle_participants); | ||
| if did_overflow { | ||
| entry.with_overflow.insert(reached_depth, data); | ||
| } else { | ||
| entry.success = Some(Success { data, reached_depth }); | ||
| } | ||
| } | ||
|
|
||
| /// Try to fetch a cached result, checking the recursion limit | ||
| /// and handling root goals of coinductive cycles. | ||
| /// | ||
| /// If this returns `Some` the cache result can be used. | ||
| pub fn get( | ||
| &self, | ||
| tcx: TyCtxt<'tcx>, | ||
| key: CanonicalInput<'tcx>, | ||
| cycle_participant_in_stack: impl FnOnce(&FxHashSet<CanonicalInput<'tcx>>) -> bool, | ||
| available_depth: Limit, | ||
| ) -> Option<CacheData<'tcx>> { | ||
| let map = self.map.borrow(); | ||
| let entry = map.get(&key)?; | ||
|
|
||
| if cycle_participant_in_stack(&entry.cycle_participants) { | ||
| return None; | ||
| } | ||
|
|
||
| if let Some(ref success) = entry.success { | ||
| if available_depth.value_within_limit(success.reached_depth) { | ||
| return Some(CacheData { | ||
| result: success.data.get(tcx), | ||
| reached_depth: success.reached_depth, | ||
| encountered_overflow: false, | ||
| }); | ||
| } | ||
| } | ||
|
|
||
| entry.with_overflow.get(&available_depth.0).map(|e| CacheData { | ||
| result: e.get(tcx), | ||
| reached_depth: available_depth.0, | ||
| encountered_overflow: true, | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| struct Success<'tcx> { | ||
| data: WithDepNode<QueryResult<'tcx>>, | ||
| reached_depth: usize, | ||
| } | ||
|
|
||
| /// The cache entry for a goal `CanonicalInput`. | ||
| /// | ||
| /// This contains results whose computation never hit the | ||
| /// recursion limit in `success`, and all results which hit | ||
| /// the recursion limit in `with_overflow`. | ||
| #[derive(Default)] | ||
| struct CacheEntry<'tcx> { | ||
| success: Option<Success<'tcx>>, | ||
| /// We have to be careful when caching roots of cycles. | ||
| /// | ||
| /// See the doc comment of `StackEntry::cycle_participants` for more | ||
| /// details. | ||
| cycle_participants: FxHashSet<CanonicalInput<'tcx>>, | ||
| with_overflow: FxHashMap<usize, WithDepNode<QueryResult<'tcx>>>, | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.