[test] Use -emit-sorted-sil and reorder CHECKs to match output. #28339
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
In some cases (Android ARMv7) the SIL output wasn't following the output of the source code, and the test failed. Use -emit-sorted-sil to use a stable sorting for the SIL, and reorder the source to match the SIL output. The output is now the same order not depending on the value of StripOwnershipAfterSerialization.
|
@swift-ci please smoke test |
|
CC: @gottesmm |
|
I don't have an issue with this, though IIRC, @gottesmm tended to prefer to avoid the |
harlanhaskins
approved these changes
Nov 19, 2019
|
@swift-ci test |
|
I'm going to merge this to avoid further breakage in the Android builds. @gottesmm if you have any problem with using |
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.
In some cases (Android ARMv7) the SIL output wasn't following the output
of the source code, and the test failed. Use
-emit-sorted-silto use astable sorting for the SIL, and reorder the source to match the SIL
output. Additionally I surrounded all the tests with the string literal quotes, so sorter checks do not match a longer test happening later (for example
nested func body inside @inlinable func bodymatching the prefixnested func body inside @inlinable func body taking local type).The output is now the same order not depending on the value of
StripOwnershipAfterSerialization.Found in #28042.