Skip to content

Revert "Work around a compiler regression affecting exit test value capturing. (#1171)" #1208

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Revert "Work around a compiler regression affecting exit test value capturing. (#1171)" #1208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 0 additions & 27 deletions Sources/Testing/Expectations/ExpectationChecking+Macro.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1175,7 +1175,6 @@ public func __checkClosureCall(
///
/// - Warning: This function is used to implement the `#expect()` and
/// `#require()` macros. Do not call it directly.
#if SWT_FIXED_154221449
@_spi(Experimental)
public func __checkClosureCall<each T>(
identifiedBy exitTestID: (UInt64, UInt64, UInt64, UInt64),
Expand All @@ -1200,32 +1199,6 @@ public func __checkClosureCall<each T>(
sourceLocation: sourceLocation
)
}
#else
@_spi(Experimental)
public func __checkClosureCall<each T>(
identifiedBy exitTestID: (UInt64, UInt64, UInt64, UInt64),
encodingCapturedValues capturedValues: repeat each T,
processExitsWith expectedExitCondition: ExitTest.Condition,
observing observedValues: [any PartialKeyPath<ExitTest.Result> & Sendable] = [],
performing _: @convention(c) () -> Void,
expression: __Expression,
comments: @autoclosure () -> [Comment],
isRequired: Bool,
isolation: isolated (any Actor)? = #isolation,
sourceLocation: SourceLocation
) async -> Result<ExitTest.Result?, any Error> where repeat each T: Codable & Sendable {
await callExitTest(
identifiedBy: exitTestID,
encodingCapturedValues: Array(repeat each capturedValues),
processExitsWith: expectedExitCondition,
observing: observedValues,
expression: expression,
comments: comments(),
isRequired: isRequired,
sourceLocation: sourceLocation
)
}
#endif
#endif

// MARK: -
Expand Down
27 changes: 0 additions & 27 deletions Sources/TestingMacros/ConditionMacro.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,20 +98,7 @@ extension ConditionMacro {
if let trailingClosureIndex {
// Assume that the comment, if present is the last argument in the
// argument list prior to the trailing closure that has no label.
#if SWT_FIXED_154221449
commentIndex = macroArguments[..<trailingClosureIndex].lastIndex { $0.label == nil }
#else
commentIndex = macroArguments[..<trailingClosureIndex].lastIndex { argument in
guard argument.label == nil else {
return false
}
if let expr = argument.expression.as(MacroExpansionExprSyntax.self),
expr.macroName.tokenKind == .identifier("__capturedValue") {
return false
}
return true
}
#endif
} else if macroArguments.count > 1 {
// If there is no trailing closure argument and there is more than one
// argument, then the comment is the last argument with no label (and also
Expand Down Expand Up @@ -560,7 +547,6 @@ extension ExitTestConditionMacro {
var leadingArguments = [
Argument(label: "identifiedBy", expression: idExpr),
]
#if SWT_FIXED_154221449
if !capturedValues.isEmpty {
leadingArguments.append(
Argument(
Expand All @@ -573,19 +559,6 @@ extension ExitTestConditionMacro {
)
)
}
#else
if let firstCapturedValue = capturedValues.first {
leadingArguments.append(
Argument(
label: "encodingCapturedValues",
expression: firstCapturedValue.typeCheckedExpression
)
)
leadingArguments += capturedValues.dropFirst()
.map(\.typeCheckedExpression)
.map { Argument(expression: $0) }
}
#endif
arguments = leadingArguments + arguments

// Replace the exit test body (as an argument to the macro) with a stub
Expand Down
2 changes: 1 addition & 1 deletion Sources/TestingMacros/Support/ClosureCaptureListParsing.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ struct CapturedValueInfo {

/// The expression to assign to the captured value with type-checking applied.
var typeCheckedExpression: ExprSyntax {
#"#__capturedValue(\#(expression.trimmed), \#(literal: name.trimmedDescription), \#(type.trimmed).self)"#
#"#__capturedValue(\#(expression.trimmed), \#(literal: name.trimmedDescription), (\#(type.trimmed)).self)"#
}

init(_ capture: ClosureCaptureSyntax, in context: some MacroExpansionContext) {
Expand Down