-
Notifications
You must be signed in to change notification settings - Fork 87
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
[WIP] Rethink how we capture expectation conditions and their subexpressions. #840
Draft
grynspan
wants to merge
9
commits into
main
Choose a base branch
from
jgrynspan/162-redesign-value-capture
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains 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
grynspan
added
public-api
Affects public API
issue-handling
Related to Issue handling within the testing library
labels
Dec 2, 2024
@swift-ci test |
grynspan
force-pushed
the
jgrynspan/162-redesign-value-capture
branch
2 times, most recently
from
December 4, 2024 22:22
31785d8
to
8c19484
Compare
@swift-ci test |
This PR is blocked by swiftlang/swift-syntax#2724 (or some alternate solution) because the following expressions would have previously compiled while they will fail with this change: try #expect(await f())
try #expect(x[123]) |
@swift-ci test |
grynspan
force-pushed
the
jgrynspan/162-redesign-value-capture
branch
from
December 10, 2024 00:57
7930583
to
f23d8a3
Compare
@swift-ci test |
grynspan
force-pushed
the
jgrynspan/162-redesign-value-capture
branch
from
December 10, 2024 05:22
4be404f
to
6608954
Compare
@swift-ci test |
1 similar comment
@swift-ci test |
grynspan
force-pushed
the
jgrynspan/162-redesign-value-capture
branch
from
December 10, 2024 23:09
9aad9f5
to
58a7c82
Compare
@swift-ci test |
grynspan
force-pushed
the
jgrynspan/162-redesign-value-capture
branch
from
December 13, 2024 21:02
58a7c82
to
5bc8b84
Compare
grynspan
force-pushed
the
jgrynspan/162-redesign-value-capture
branch
2 times, most recently
from
December 17, 2024 17:37
191352a
to
da992cb
Compare
@swift-ci test |
grynspan
force-pushed
the
jgrynspan/162-redesign-value-capture
branch
from
December 17, 2024 22:16
958457c
to
9655fe4
Compare
@swift-ci test |
1 similar comment
@swift-ci test |
grynspan
force-pushed
the
jgrynspan/162-redesign-value-capture
branch
from
December 19, 2024 06:55
51b102b
to
cd72c9c
Compare
@swift-ci test |
grynspan
force-pushed
the
jgrynspan/162-redesign-value-capture
branch
2 times, most recently
from
January 8, 2025 20:46
2fbd803
to
a195488
Compare
@swift-ci test |
@swift-ci test Linux |
grynspan
force-pushed
the
jgrynspan/162-redesign-value-capture
branch
2 times, most recently
from
January 14, 2025 14:44
7e83764
to
6d15dbc
Compare
@swift-ci test |
This was referenced Jan 16, 2025
This PR completely rewrites how we capture expectation conditions. For example, given the following expectation: ```swift ``` We currently detect that there is a binary operation and emit code that calls the binary operator as a closure and passes the left-hand value and right-hand value, then checks that the result of the operation is `true`. This is sufficient for simpler expressions like that one, but more complex ones (including any that involve `try` or `await` keywords) cannot be expanded correctly. With this PR, such expressions _can_ generally be expanded correctly. The change involves rewriting the macro condition as a closure to which is passed a local, mutable "context" value. Subexpressions of the condition expression are then rewritten by walking the syntax tree of the expression (using typical swift-syntax API) and replacing them with calls into the context value that pass in the value and related state. If the expectation ultimately fails, the collected data is transformed into an instance of the SPI type `Expression` that contains the source code of the expression and interesting subexpressions as well as the runtime values of those subexpressions. Nodes in the syntax tree are identified by a unique ID which is composed of the swift-syntax ID for that node as well as all its parent nodes in a compact bitmask format. These IDs can be transformed into graph/trie key paths when expression/subexpression relationships need to be reconstructed on failure, meaning that a single rewritten node doesn't otherwise need to know its "place" in the overall expression. There remain a few caveats (that also generally affect the current implementation): - Mutating member functions are syntactically indistinguishable from non-mutating ones and miscompile when rewritten; - Expressions involving move-only types are also indistinguishable, but need lifetime management to be rewritten correctly; and - Expressions where the `try` or `await` keyword is _outside_ the `#expect` macro cannot be expanded correctly because the macro cannot see those keywords during expansion. The first issue might be resolvable in the future using pointer tricks, although I don't hold a lot of hope for it. The second issue is probably resolved by non-escaping types. The third issue is an area of active exploration for us and the macros/swift-syntax team.
grynspan
force-pushed
the
jgrynspan/162-redesign-value-capture
branch
from
January 22, 2025 23:38
6d15dbc
to
32e45e5
Compare
@swift-ci test |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
enhancement
New feature or request
issue-handling
Related to Issue handling within the testing library
public-api
Affects public API
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 PR completely rewrites how we capture expectation conditions.
Explanation
For example, given the following expectation:
We currently detect that there is a binary operation and emit code that calls the binary operator as a closure and passes the left-hand value and right-hand value, then checks that the result of the operation is
true
.This is sufficient for simpler expressions like that one, but more complex ones (including any that involve
try
orawait
keywords) cannot be expanded correctly. With this PR, such expressions can generally be expanded correctly.The change involves rewriting the macro condition as a closure to which is passed a local, mutable "context" value. Subexpressions of the condition expression are then rewritten by walking the syntax tree of the expression (using typical swift-syntax API) and replacing them with calls into the context value that pass in the value and related state.
If the expectation ultimately fails, the collected data is transformed into an instance of the SPI type
Expression
that contains the source code of the expression and interesting subexpressions as well as the runtime values of those subexpressions.Nodes in the syntax tree are identified by a unique ID which is composed of the swift-syntax ID for that node as well as all its parent nodes in a compact bitmask format. These IDs can be transformed into graph/trie key paths when expression/subexpression relationships need to be reconstructed on failure, meaning that a single rewritten node doesn't otherwise need to know its "place" in the overall expression.
Examples
As an example, this expectation…
… previously expanded to…
… but will now expand to:
More interestingly, an expression with side effects or complex nested operations can also be translated. For example, this throwing expression…
… was…
… but now becomes:
Caveats
There remain a few caveats (that also generally affect the current implementation):
try
orawait
keyword is outside the#expect
macro cannot be expanded correctly because the macro cannot see those keywords during expansion.The first issue might be resolvable in the future using pointer tricks, although I don't hold a lot of hope for it. The second issue is probably resolved by non-escaping types. The third issue is an area of active exploration for us and the macros/swift-syntax team.
Resolved Issues
Resolves #162.
Resolves rdar://137583415.
Resolves rdar://135437448.
Checklist: