Fix some rebranch test failures on main #81279
Merged
+930
−931
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
…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.
… upstream LLVM The current pattern does not match a ')' inside the argument list. This will no longer work because `nocapture` became `captures(none) in 29441e4f5fa5f5c7709f7cf180815ba97f611297 (llvm-project). Use a wildcard regex instead. Doing so does not compromise the test because the `unnamed_addr` attribute we are guarding against can appear only after the argument list. This is intended to reduce future conflicts with rebranch.
…te in upstream LLVM The parameter attribute was introduced in 5ece35df8586d0cb8c104a9f44eaae771de025f5 (llvm-project) and is expected here according to the lowered function bodies. Match it using a wildcard regex, since it is not relevant to these tests. This is intended to reduce future conflicts with rebranch.
…in upstream LLVM The `captures(ret: address, provenance)` parameter attribute is expected because these functions either immediately return the pointer argument or pass it as an argument to another such parameter. See https://llvm.org/docs/LangRef.html#parameter-attributes. Match it using a wildcard regex, since it is not relevant to these tests. This is intended to reduce future conflicts with rebranch.
…pstream LLVM The attribute is `range(i8 -127, -128)`. The documentation specifies that the range can wrap, meaning that for i8 [-127, -128) is equivalent to [-127, 127). This is expected for a function that simply increments a i8 value. See https://llvm.org/docs/LangRef.html#parameter-attributes. Match it using a wildcard regex, since it is not relevant to this test. This is intended to reduce future conflicts with rebranch.
AnthonyLatsis
requested review from
zoecarver,
egorzhdan,
Xazax-hun,
j-hui,
fahadnayyar,
susmonteiro,
hnrklssn,
rjmccall,
ktoso and
adrian-prantl
as code owners
|
@swift-ci please smoke test |
…in upstream LLVM `alias nocapture swiftself` -> `alias swiftself captures(none)`. `nocapture` became `captures(none)` in 29441e4f5fa5f5c7709f7cf180815ba97f611297 (llvm-project). This is intended to reduce future conflicts with rebranch.
AnthonyLatsis
force-pushed
the
fix-rebranch-on-main
branch
from
623b3f3 to
76333e2
Compare
|
@swift-ci please smoke test |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 is intended to reduce future conflicts with rebranch. These commits are picked from #81190.