🍒 [6.2] [cxx-interop] Avoid querying layout of dependent types during symbolic import #81235
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
(cherry picked from commit 9b0ab90)
…h a custom type is reused (cherry picked from commit 5fdbb44)
…c import In swiftlang#80786, we started importing certain padded fields as opaque blobs. Part of this logic involved querying those fields' ASTRecordLayout. However, dependent types (which are imported symbolically) do not have an ASTRecordLayout, so calling Clang's getASTRecordLayout() would lead to an assertion error for class templates where a no_unique_address field is some kind of dependent C++ record type. This patch avoids the field padding check during symbolic import mode because that check is only relevant for codegen anyway. rdar://150067288 (cherry picked from commit 1fdb239)
|
@swift-ci please test |
egorzhdan
approved these changes
May 1, 2025
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.
Explanation: This patch avoids querying the ASTRecordLayout of
[[no_unique_address]]fields when symbolic import is enabled. Symbolic import mode causes ClangImporter to import uninstantiated class templates, which may contain dependent-typed fields that trigger an assertion failure when querying their layout (since their layout depends on a non-concrete template argument).Issue: rdar://150067288
Risk: low
Testing: added tests
Original PRs: #81228
Reviewer: @egorzhdan