Skip to content
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
wants to merge 9 commits into
base: main
Choose a base branch
from

Conversation

grynspan
Copy link
Contributor

@grynspan grynspan commented Dec 2, 2024

This PR completely rewrites how we capture expectation conditions.

Explanation

For example, given the following expectation:

#expect(x.f() == 123)

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.

Examples

As an example, this expectation…

#expect(g() > 500)

… previously expanded to…

Testing.__checkBinaryOperation(
  g(),
  { $0 > $1() },
  500,
  expression: .__fromBinaryOperation(
    .__fromSyntaxNode("g()"),
    ">",
    .__fromSyntaxNode("500")
  ),
  comments: [],
  isRequired: false,
  sourceLocation: Testing.SourceLocation.__here()
).__expected()

… but will now expand to:

Testing.__checkCondition(
  { (__ec: inout Testing.__ExpectationContext) -> Swift.Bool in
    __ec(__ec(g(),0x2) > 500,0x0)
  },
  sourceCode: [
    0x0: "g() > 500",
    0x2: "g()"
  ],
  comments: [],
  isRequired: false,
  sourceLocation: Testing.SourceLocation.__here()
).__expected()

More interestingly, an expression with side effects or complex nested operations can also be translated. For example, this throwing expression…

#expect((try g() > 500) && true)

… was…

Testing.__checkValue(
  (try g() > 500) && true,
  expression: .__fromSyntaxNode("(try g() > 500) && true"),
  comments: [],
  isRequired: false,
  sourceLocation: Testing.SourceLocation.__here()
).__expected()

… but now becomes:

try Testing.__checkCondition(
  { (__ec: inout Testing.__ExpectationContext) -> Swift.Bool in
    try Testing.__requiringTry(__ec(__ec((try __ec(__ec(g(),0x1ba) > 500,0xba)),0x2) && __ec(true,0x400000),0x0))
  },
  sourceCode: [
    0x0: "(try g() > 500) && true",
    0x2: "(try g() > 500)",
    0xba: "g() > 500",
    0x1ba: "g()",
    0x400000: "true"
  ],
  comments: [],
  isRequired: false,
  sourceLocation: Testing.SourceLocation.__here()
).__expected()

Caveats

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.

Resolved Issues

Resolves #162.
Resolves rdar://137583415.
Resolves rdar://135437448.

Checklist:

  • Code and documentation should follow the style of the Style Guide.
  • If public symbols are renamed or modified, DocC references should be updated.

@grynspan grynspan added public-api Affects public API issue-handling Related to Issue handling within the testing library labels Dec 2, 2024
@grynspan grynspan added this to the Swift 6.x milestone Dec 2, 2024
@grynspan grynspan self-assigned this Dec 2, 2024
@grynspan
Copy link
Contributor Author

grynspan commented Dec 2, 2024

@swift-ci test

@grynspan grynspan force-pushed the jgrynspan/162-redesign-value-capture branch 2 times, most recently from 31785d8 to 8c19484 Compare December 4, 2024 22:22
@grynspan
Copy link
Contributor Author

grynspan commented Dec 5, 2024

@swift-ci test

@grynspan
Copy link
Contributor Author

grynspan commented Dec 5, 2024

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])

@grynspan
Copy link
Contributor Author

grynspan commented Dec 5, 2024

@swift-ci test

3 similar comments
@grynspan
Copy link
Contributor Author

grynspan commented Dec 5, 2024

@swift-ci test

@grynspan
Copy link
Contributor Author

grynspan commented Dec 5, 2024

@swift-ci test

@grynspan
Copy link
Contributor Author

grynspan commented Dec 5, 2024

@swift-ci test

@grynspan grynspan added the enhancement New feature or request label Dec 9, 2024
@grynspan grynspan force-pushed the jgrynspan/162-redesign-value-capture branch from 7930583 to f23d8a3 Compare December 10, 2024 00:57
@grynspan
Copy link
Contributor Author

@swift-ci test

3 similar comments
@grynspan
Copy link
Contributor Author

@swift-ci test

@grynspan
Copy link
Contributor Author

@swift-ci test

@grynspan
Copy link
Contributor Author

@swift-ci test

@grynspan grynspan force-pushed the jgrynspan/162-redesign-value-capture branch from 4be404f to 6608954 Compare December 10, 2024 05:22
@grynspan
Copy link
Contributor Author

@swift-ci test

1 similar comment
@grynspan
Copy link
Contributor Author

@swift-ci test

@grynspan grynspan force-pushed the jgrynspan/162-redesign-value-capture branch from 9aad9f5 to 58a7c82 Compare December 10, 2024 23:09
@grynspan
Copy link
Contributor Author

@swift-ci test

@grynspan grynspan force-pushed the jgrynspan/162-redesign-value-capture branch from 58a7c82 to 5bc8b84 Compare December 13, 2024 21:02
@grynspan grynspan force-pushed the jgrynspan/162-redesign-value-capture branch 2 times, most recently from 191352a to da992cb Compare December 17, 2024 17:37
@grynspan
Copy link
Contributor Author

@swift-ci test

@grynspan grynspan force-pushed the jgrynspan/162-redesign-value-capture branch from 958457c to 9655fe4 Compare December 17, 2024 22:16
@grynspan
Copy link
Contributor Author

@swift-ci test

1 similar comment
@grynspan
Copy link
Contributor Author

@swift-ci test

@grynspan grynspan force-pushed the jgrynspan/162-redesign-value-capture branch from 51b102b to cd72c9c Compare December 19, 2024 06:55
@grynspan
Copy link
Contributor Author

@swift-ci test

3 similar comments
@grynspan
Copy link
Contributor Author

@swift-ci test

@grynspan
Copy link
Contributor Author

@swift-ci test

@grynspan
Copy link
Contributor Author

@swift-ci test

@grynspan
Copy link
Contributor Author

grynspan commented Jan 8, 2025

@swift-ci test

@grynspan
Copy link
Contributor Author

@swift-ci test Linux

@grynspan grynspan force-pushed the jgrynspan/162-redesign-value-capture branch 2 times, most recently from 7e83764 to 6d15dbc Compare January 14, 2025 14:44
@grynspan
Copy link
Contributor Author

@swift-ci test

grynspan and others added 9 commits January 22, 2025 18:38
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 grynspan force-pushed the jgrynspan/162-redesign-value-capture branch from 6d15dbc to 32e45e5 Compare January 22, 2025 23:38
@grynspan
Copy link
Contributor Author

@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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Value not shown in error message when an expectation condition has effects (try/await)
1 participant