Skip to content

[test] Match nocapture to succeed both on main and rebranch #81375

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

Merged
merged 3 commits into from
May 9, 2025

Conversation

AnthonyLatsis
Copy link
Collaborator

@AnthonyLatsis AnthonyLatsis commented May 8, 2025

Both the syntax and relative order of the LLVM nocapture parameter attribute changed upstream in llvm/llvm-project#123181. To reduce conflicts with rebranch, adjust FileCheck patterns to expect both syntaxes and orders anywhere the presence of the attribute is not critical to the test. These changes are temporary and will be cleaned up once rebranch is merged into main.

@AnthonyLatsis
Copy link
Collaborator Author

@swift-ci please smoke test macOS

AnthonyLatsis added a commit to AnthonyLatsis/swift that referenced this pull request May 8, 2025
… `nocapture` to `captures(none)`"

This reverts most test changes in commit
f93aba0. These changes will be done a
bit differenty on main instead:
swiftlang#81375.
@AnthonyLatsis AnthonyLatsis force-pushed the nocapture-both-ways branch 2 times, most recently from bf2256e to 833c3dd Compare May 8, 2025 17:03
@AnthonyLatsis
Copy link
Collaborator Author

@swift-ci please smoke test macOS

…stream LLVM

This attribute was introduced in
7eca38ce76d5d1915f4ab7e665964062c0b37697 (llvm-project).

Match it using a wildcard regex, since it is not relevant to these
tests.

This is intended to reduce future conflicts with rebranch.
…e in upstream LLVM

The parameter attribute was introduced in
5ece35df8586d0cb8c104a9f44eaae771de025f5 (llvm-project) and is expected
here according to the lowered function body.

Match it using a wildcard regex, since it is not relevant to this test.

This is intended to reduce future conflicts with rebranch.
@AnthonyLatsis AnthonyLatsis force-pushed the nocapture-both-ways branch from 833c3dd to 8f14011 Compare May 8, 2025 22:48
@AnthonyLatsis
Copy link
Collaborator Author

@swift-ci please smoke test

Both the syntax and relative order of the LLVM `nocapture` parameter
attribute changed upstream in 29441e4f5fa5f5c7709f7cf180815ba97f611297.
To reduce conflicts with rebranch, adjust FileCheck patterns to expect
both syntaxes and orders anywhere the presence of the attribute is not
critical to the test. These changes are temporary and will be cleaned
up once rebranch is merged into main.
@AnthonyLatsis AnthonyLatsis force-pushed the nocapture-both-ways branch from 8f14011 to 55e5618 Compare May 8, 2025 22:53
@AnthonyLatsis
Copy link
Collaborator Author

@swift-ci please smoke test

@AnthonyLatsis AnthonyLatsis enabled auto-merge May 8, 2025 23:02
@AnthonyLatsis AnthonyLatsis disabled auto-merge May 8, 2025 23:34
AnthonyLatsis added a commit to AnthonyLatsis/swift that referenced this pull request May 9, 2025
… `nocapture` to `captures(none)`"

This reverts most test changes in commit
f93aba0. These changes will be done a
bit differenty on main instead:
swiftlang#81375.
@AnthonyLatsis AnthonyLatsis merged commit 0e6f3a8 into swiftlang:main May 9, 2025
3 checks passed
@AnthonyLatsis AnthonyLatsis deleted the nocapture-both-ways branch May 9, 2025 13:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants