-
Notifications
You must be signed in to change notification settings - Fork 10.5k
GSB: Rewrite redundant requirements algorithm for the second time #37078
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
slavapestov
wants to merge
13
commits into
swiftlang:main
from
slavapestov:new-redundant-requirements-algorithm
Closed
GSB: Rewrite redundant requirements algorithm for the second time #37078
slavapestov
wants to merge
13
commits into
swiftlang:main
from
slavapestov:new-redundant-requirements-algorithm
Conversation
This file contains hidden or 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
d846c59
to
5df65ca
Compare
Every valid signature should have at least one requirement that can be removed while still producing a valid signature.
This rewrites the existing redundant requirements algorithm to be simpler, and fix an incorrect behavior in the case where we're building a protocol requirement signature. Consider the following example: protocol P { associatedtype A : P associatedtype B : P where A.B == B } The requirement B : P has two conformance paths here: (B : P) (A : P)(B : P) The naive redundancy algorithm would conclude that (B : P) is redundant because it can be derived as (A : P)(B : P). However, if we drop (B : P), we lose the derived conformance path as well, since it involves the same requirement (B : P). The above example actually worked before this change, because we handled this case in getMinimalConformanceSource() by dropping any derived conformance paths that involve the requirement itself appearing in the "middle" of the path. However, this is insufficient because you can have a "cycle" here with length more than 1. For example, protocol P { associatedtype A : P where A == B.C associatedtype B : P where B == A.C associatedtype C : P where C == A.B } The requirement A : P has two conformance paths here: (A : P) (B : P)(C : P) Similarly, B : P has these two paths: (B : P) (A : P)(C : P) And C : P has these two paths: (C : P) (A : P)(B : P) Since each one of A : P, B : P and C : P has a derived conformance path that does not involve itself, we would conclude that all three were redundant. But this was wrong; while (B : P)(C : P) is a valid derived path for A : P that allows us to drop A : P, once we commit to dropping A : P, we can no longer use the other derived paths (A : P)(C : P) for B : P, and (A : P)(B : P) for C : P, respectively, because they involve A : P, which we dropped. The problem is that we were losing information here. The explicit requirement A : P can be derived as (B : P)(C : P), but we would just say that it was implied by B : P alone. For non-protocol generic signatures, just looking at the root is still sufficient. However, when building a requirement signature of a self-recursive protocol, instead of looking at the root explicit requirement only, we need to look at _all_ intermediate steps in the path that involve the same protocol. This is implemented in a new getBaseRequirements() method, which generalizes the operation of getting the explicit requirement at the root of a derived conformance path by returning a vector of one or more explicit requirements that appear in the path. Also the new algorithm computes redundancy online instead of building a directed graph and then computing SCCs. This is possible by recording newly-discovered redundant requirements immediately, and then using the set of so-far-redundant requirements when evaluating a path. This commit introduces a small regression in an existing test case involving a protocol with a 'derived via concrete' requirement. Subsequent commits in this PR fix the regression and remove the 'derived via concrete' mechanism, since it is no longer necessary. Fixes https://bugs.swift.org/browse/SR-14510 / rdar://problem/76883924.
5df65ca
to
a007645
Compare
…nce requirements This fixes a regression from the new redundant requirements algorithm and paves the way for removing the notion of 'derived via concrete' requirements.
…ivalence classes Literally an off-by-one error -- we were skipping over the first requirement and not copying it over. I think this is because the updateLayout() call used to be addLayoutRequirementDirect(), which would add the first layout constraint, and I forgot to remove the '+ 1' when I refactored this.
a007645
to
b799942
Compare
b799942
to
aedba4d
Compare
@swift-ci Please test |
@swift-ci Please test source compatibility |
@swift-ci Please ASAN test |
Build failed |
@swift-ci Please test macOS |
@swift-ci Please smoke test macOS |
1 similar comment
@swift-ci Please smoke test macOS |
CoreStore and swift-futures failed in source compat testing, so I need to investigate those first. |
Let's just have one PR instead of two. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This rewrites the existing redundant requirements algorithm to be simpler, and fix an incorrect behavior in the case where
we're building a protocol requirement signature.
Consider the following example:
The requirement B : P has two conformance paths here:
The naive redundancy algorithm would conclude that (B : P) is redundant because it can be derived as (A : P)(B : P). However, if we drop (B : P), we lose the derived conformance path as well, since it involves the same requirement (B : P).
The above example actually worked before this change, because we handled this case in getMinimalConformanceSource() by dropping any derived conformance paths that involve the requirement itself appearing in the "middle" of the path.
However, this is insufficient because you can have a "cycle" here with length more than 1. For example,
The requirement A : P has two conformance paths here:
Similarly, B : P has these two paths:
And C : P has these two paths:
Since each one of A : P, B : P and C : P has a derived conformance path that does not involve itself, we would conclude that all three were redundant. But this was wrong; while (B : P)(C : P) is a valid derived path for A : P that allows us to drop A : P, once we commit to dropping A : P, we can no longer use the other derived paths (A : P)(C : P) for B : P, and (A : P)(B : P) for C : P, respectively, because they involve A : P, which we dropped.
The problem is that we were losing information here. The explicit requirement A : P can be derived as (B : P)(C : P), but we would just say that it was implied by B : P alone.
For non-protocol generic signatures, just looking at the root is still sufficient.
However, when building a requirement signature of a self-recursive protocol, instead of looking at the root explicit requirement only, we need to look at all intermediate steps in the path that involve the same protocol.
This is implemented in a new getBaseRequirements() method, which generalizes the operation of getting the explicit requirement at the root of a derived conformance path by returning a vector of one or more explicit requirements that appear in the path.
Also the new algorithm computes redundancy online instead of building a directed graph and then computing SCCs. This is possible by recording newly-discovered redundant requirements immediately, and then using the set of so-far-redundant requirements when evaluating a path.
Fixes https://bugs.swift.org/browse/SR-14510 / rdar://problem/76883924.