[cherry-pick][stable/20230725] [clang][ASTImporter] Only reorder fields of RecordDecls #7945
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
…rect layout" This relands e953669, because a follow-up fix (f8e2effc3aff8077ad301a5a3956c514a2e604a9) will be cherry-picked that fixes the issue that motivated the original revert.
Prior to `e9536698720ec524cc8b72599363622bc1a31558` (https://reviews.llvm.org/D154764) we only re-ordered the fields of `RecordDecl`s. The change refactored this logic to make sure `FieldDecl`s are imported before other member decls. However, this change also widened the types of `DeclContext`s we consider for re-ordering from `RecordDecl` to anything that's a `DeclContext`. This seems to have been just a drive-by cleanup. Internally we've seen numerous crashes in LLDB where we try to perform this re-ordering on fields of `ObjCInterfaceDecl`s. This patch restores old behaviour where we limit the re-ordering to just `RecordDecl`s. rdar://119343184 rdar://119636274 rdar://119832131 (cherry picked from commit 34dbadd)
adrian-prantl
approved these changes
Jan 9, 2024
|
@swift-ci 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.
Prior to
e9536698720ec524cc8b72599363622bc1a31558(https://reviews.llvm.org/D154764) we only re-ordered the fields ofRecordDecls. The change refactored this logic to make sureFieldDecls are imported before other member decls. However, this change also widened the types ofDeclContexts we consider for re-ordering fromRecordDeclto anything that's aDeclContext. This seems to have been just a drive-by cleanup.Internally we've seen numerous crashes in LLDB where we try to perform this re-ordering on fields of
ObjCInterfaceDecls.This patch restores old behaviour where we limit the re-ordering to just
RecordDecls.rdar://119343184
rdar://119636274
rdar://119832131