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

move behavior out of shared fn

Browse Source
This commit is contained in:
lcnr 2024-07-23 23:03:34 +02:00
parent 9308401df5
commit e83eacdfaa
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
compiler/rustc_type_ir/src/search_graph/mod.rs
View File

@ -300,17 +300,7 @@ impl<D: Delegate<Cx = X>, X: Cx> SearchGraph<D> {
// We update both the head of this cycle to rerun its evaluation until // We update both the head of this cycle to rerun its evaluation until
// we reach a fixpoint and all other cycle participants to make sure that // we reach a fixpoint and all other cycle participants to make sure that
// their result does not get moved to the global cache. // their result does not get moved to the global cache.
fn tag_cycle_participants( fn tag_cycle_participants(stack: &mut IndexVec<StackDepth, StackEntry<X>>, head: StackDepth) {
stack: &mut IndexVec<StackDepth, StackEntry<X>>,
usage_kind: Option<UsageKind>,
head: StackDepth,
) {
if let Some(usage_kind) = usage_kind {
stack[head].has_been_used =
Some(stack[head].has_been_used.map_or(usage_kind, |prev| prev.merge(usage_kind)));
}
debug_assert!(stack[head].has_been_used.is_some());
// The current root of these cycles. Note that this may not be the final // The current root of these cycles. Note that this may not be the final
// root in case a later goal depends on a goal higher up the stack. // root in case a later goal depends on a goal higher up the stack.
let mut current_root = head; let mut current_root = head;
@ -403,7 +393,8 @@ impl<D: Delegate<Cx = X>, X: Cx> SearchGraph<D> {
// We have a nested goal which is already in the provisional cache, use // We have a nested goal which is already in the provisional cache, use
// its result. We do not provide any usage kind as that should have been // its result. We do not provide any usage kind as that should have been
// already set correctly while computing the cache entry. // already set correctly while computing the cache entry.
Self::tag_cycle_participants(&mut self.stack, None, entry.head); debug_assert!(self.stack[entry.head].has_been_used.is_some());
Self::tag_cycle_participants(&mut self.stack, entry.head);
return entry.result; return entry.result;
} else if let Some(stack_depth) = cache_entry.stack_depth { } else if let Some(stack_depth) = cache_entry.stack_depth {
debug!("encountered cycle with depth {stack_depth:?}"); debug!("encountered cycle with depth {stack_depth:?}");
@ -416,11 +407,13 @@ impl<D: Delegate<Cx = X>, X: Cx> SearchGraph<D> {
let is_coinductive_cycle = Self::stack_coinductive_from(cx, &self.stack, stack_depth); let is_coinductive_cycle = Self::stack_coinductive_from(cx, &self.stack, stack_depth);
let cycle_kind = let cycle_kind =
if is_coinductive_cycle { CycleKind::Coinductive } else { CycleKind::Inductive }; if is_coinductive_cycle { CycleKind::Coinductive } else { CycleKind::Inductive };
Self::tag_cycle_participants( let usage_kind = UsageKind::Single(cycle_kind);
&mut self.stack, self.stack[stack_depth].has_been_used = Some(
Some(UsageKind::Single(cycle_kind)), self.stack[stack_depth]
stack_depth, .has_been_used
.map_or(usage_kind, |prev| prev.merge(usage_kind)),
); );
Self::tag_cycle_participants(&mut self.stack, stack_depth);
// Return the provisional result or, if we're in the first iteration, // Return the provisional result or, if we're in the first iteration,
// start with no constraints. // start with no constraints.