[cxx-interop][rebranch] Handle clang elaborated types properly #62190
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
Contributor
Author
|
@swift-ci please smoke test |
Contributor
Author
|
@swift-ci please test |
egorzhdan
force-pushed
the
egorzhdan/clang-elaborated
branch
from
9ddde90 to
9a6435a
Compare
Contributor
Author
|
@swift-ci please smoke test |
Contributor
Author
|
@swift-ci please test |
Contributor
Author
|
@swift-ci please test macOS |
Clang recently started wrapping more types in `clang::ElaboratedType` after this change: https://reviews.llvm.org/D112374 This broke some assumptions in ClangImporter, specifically in enum handling logic. This change adjusts those. Fixes these tests in rebranch: * `Interop/Cxx/enum/anonymous-with-swift-name-module-interface.swift` * `Interop/Cxx/enum/anonymous-with-swift-name-objc-module-interface.swift` * `Interop/Cxx/enum/anonymous-with-swift-name.swift` * `Interop/Cxx/enum/c-enums-NS_OPTIONS-NS_REFINED_FOR_SWIFT.swift` * `Interop/Cxx/enum/c-enums-NS_OPTIONS.swift` * `Interop/Cxx/enum/c-enums-withOptions-omit.swift` * `Interop/Cxx/class/inheritance/fields-module-interface.swift` * `Interop/Cxx/class/inheritance/fields.swift` * `Interop/Cxx/class/inheritance/functions-module-interface.swift` * `Interop/Cxx/class/inheritance/sub-types-module-interface.swift` * `Interop/Cxx/class/inheritance/type-aliases-module-interface.swift`
egorzhdan
force-pushed
the
egorzhdan/clang-elaborated
branch
from
9a6435a to
8d98f50
Compare
Contributor
Author
|
@swift-ci please smoke test |
Contributor
Author
|
@swift-ci please test |
Contributor
Author
|
@swift-ci please smoke test |
egorzhdan
added a commit
that referenced
this pull request
Dec 1, 2022
This applies the same trick as #62190 for newly written code. Fixes two C++ interop tests in rebranch: * `Interop/Cxx/enum/c-enums-NS_OPTIONS-api-notes-renamed-options.swift` * `Interop/Cxx/enum/c-enums-NS_OPTIONS-swift-named-options.swift` rdar://102858524
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.
Clang recently started wrapping more types in
clang::ElaboratedTypeafter this change: https://reviews.llvm.org/D112374This broke some assumptions in ClangImporter, specifically in enum handling logic. This change adjusts those.
Fixes these tests in rebranch:
Interop/Cxx/enum/anonymous-with-swift-name-module-interface.swiftInterop/Cxx/enum/anonymous-with-swift-name-objc-module-interface.swiftInterop/Cxx/enum/anonymous-with-swift-name.swiftInterop/Cxx/enum/c-enums-NS_OPTIONS-NS_REFINED_FOR_SWIFT.swiftInterop/Cxx/enum/c-enums-NS_OPTIONS.swiftInterop/Cxx/enum/c-enums-withOptions-omit.swiftInterop/Cxx/class/inheritance/fields-module-interface.swiftInterop/Cxx/class/inheritance/fields.swiftInterop/Cxx/class/inheritance/functions-module-interface.swiftInterop/Cxx/class/inheritance/sub-types-module-interface.swiftInterop/Cxx/class/inheritance/type-aliases-module-interface.swift