Simplify BindingSet construction #86031
Open
+249
−162
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
slavapestov
force-pushed
the
binding-set-constructor-speedup
branch
from
6d3c6f2 to
f690933
Compare
Contributor
Author
|
@swift-ci Please test source compatibility |
Contributor
Author
|
@swift-ci Please smoke test |
xedin
reviewed
Dec 13, 2025
| llvm::SmallVector<LiteralRequirement, 2> Literals; | ||
|
|
||
| llvm::SmallDenseMap<CanType, Constraint *, 2> Defaults; | ||
| llvm::SmallVector<Constraint *, 2> Defaults; |
Contributor
There was a problem hiding this comment.
Does this not make things slower when there duplicate defaultable constraints?
Contributor
Author
There was a problem hiding this comment.
That's a good point, do you mean the same constraint getting added multiple times, or multiple constraints with the same second type? I'll check for both and see if it can happen
Contributor
There was a problem hiding this comment.
It could be both I think, this is the worst case when multiple type variables form an equivalence class and each has a literal requirement.
xedin
reviewed
Dec 13, 2025
| auto &ctx = CS.getASTContext(); | ||
| return Literals.count( | ||
| ctx.getProtocol(KnownProtocolKind::ExpressibleByNilLiteral)); | ||
| for (const auto &literal : Literals) { |
Contributor
There was a problem hiding this comment.
I guess this could also be slimmed down by llvm::any_of
The only place where we did a lookup, we also iterated over it anyway, and all remaining usages are simplified by downgrading it to a vector.
…ngSet::BindingSet, and do it at the end
We shouldn't store a pointer to the ConstraintSystem inside every BindingSet, but there are some annoying things to untangle before we can do that. As a starting point toward that, remove the getConstraintSystem() getter so that at least we can't reach up to the ConstraintSystem from the outside.
slavapestov
force-pushed
the
binding-set-constructor-speedup
branch
from
f690933 to
d795c18
Compare
Contributor
Author
|
@swift-ci Please smoke test |
Contributor
Author
|
@swift-ci Please test source compatibility |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
The
PotentialBindings::Constraintsset can contain a lot of irrelevant constraints. Removing the iteration over this set fromBindingSet::BindingSetspeeds type checking a large array literal of tuples of integers by ~25%.