Requirement Machine: Fix crash on pack + tuple type #85235
Merged
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
reviewed
Oct 31, 2025
Contributor
slavapestov
left a comment
slavapestov
left a comment
There was a problem hiding this comment.
Nitpick: For commit messages, we tend to use Foo: Bar, baz or [Foo] Bar, baz
lib/AST/RequirementMachine/Term.cpp
Outdated
| return back().getKind() == Symbol::Kind::Shape; | ||
| } | ||
|
|
||
| MutableTerm Term::termWithoutShape() { |
Contributor
There was a problem hiding this comment.
This method should be const
lib/AST/RequirementMachine/Term.cpp
Outdated
|
|
||
| MutableTerm Term::termWithoutShape() { | ||
| if (hasShape()) | ||
| return MutableTerm(begin(), end()-1); |
Contributor
There was a problem hiding this comment.
Nitpick: we usually put spaces around operators
lib/AST/RequirementMachine/Term.cpp
Outdated
| return back().getKind() == Symbol::Kind::Shape; | ||
| } | ||
|
|
||
| MutableTerm MutableTerm::termWithoutShape() { |
Adding abstractions to check terms for shape symbol and remove the shape symbol from the end of the sequence of symbols, rather than manually manipulating the end() sequence externally.
…ashes Support pack expansion types in term rewriting, maintaining shape invariants and not throwing assertions unnecessarily. Additional tests added for an inifinite case and a concrete case.
kathygray-pl
force-pushed
the
requirementMachinePack
branch
from
385d7f2 to
d68a7a7
Compare
Contributor
Author
|
@swift-ci Please smoke test |
slavapestov
approved these changes
Nov 2, 2025
Contributor
|
Please fix the PR title to be more descriptive, otherwise it looks good to go. |
kathygray-pl
changed the title
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.
Requirement Machine: Fix crashes on (some) pack + tuple types
Fixes issue #84490