Skip to content

Commit b67f428

Browse files
committed
Auto merge of #45065 - arielb1:not-correct, r=nikomatsakis
fix logic error in #44269's `prune_cache_value_obligations` We want to retain obligations that *contain* inference variables, not obligations that *don't contain* them, in order to fix #43132. Because of surrounding changes to inference, the ICE doesn't occur in its original case, but I believe it could still be made to occur on master. Maybe I should try to write a new test case? Certainly not right now (I'm mainly trying to get us a beta that we can ship) but maybe before we land this PR on nightly? This seems to cause a 10% performance regression in my imprecise attempt to benchmark item-body checking for #43613, but it's better to be slow and right than fast and wrong. If we want to recover that, I think we can change the constrained-type-parameter code to actually give a list of projections that are important for resolving inference variables and filter everything else out.
2 parents a8feaee + 91fdadb commit b67f428

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/librustc/traits/project.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -638,7 +638,7 @@ fn prune_cache_value_obligations<'a, 'gcx, 'tcx>(infcx: &'a InferCtxt<'a, 'gcx,
638638
// but we have `T: Foo<X = ?1>` and `?1: Bar<X =
639639
// ?0>`).
640640
ty::Predicate::Projection(ref data) =>
641-
!infcx.any_unresolved_type_vars(&data.ty()),
641+
infcx.any_unresolved_type_vars(&data.ty()),
642642

643643
// We are only interested in `T: Foo<X = U>` predicates, whre
644644
// `U` references one of `unresolved_type_vars`. =)

0 commit comments

Comments
 (0)