[PATCH] D66866: [ASTImporter] At import of records re-order indirect fields too.
Balázs Kéri via Phabricator via cfe-commits
cfe-commits at lists.llvm.org
Wed Aug 28 02:57:17 PDT 2019
balazske created this revision.
Herald added subscribers: cfe-commits, gamesh411, Szelethus, dkrupp.
Herald added a reviewer: martong.
Herald added a reviewer: a.sidorin.
Herald added a reviewer: shafik.
Herald added a project: clang.
Correct order of fields and indirect fields in imported RecordDecl
is needed for correct work of record layout calculations.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D66866
Files:
clang/lib/AST/ASTImporter.cpp
clang/unittests/AST/ASTImporterTest.cpp
Index: clang/unittests/AST/ASTImporterTest.cpp
===================================================================
--- clang/unittests/AST/ASTImporterTest.cpp
+++ clang/unittests/AST/ASTImporterTest.cpp
@@ -1431,6 +1431,23 @@
return Index == Order.size();
}
+AST_MATCHER_P(RecordDecl, hasFieldIndirectFieldOrder, std::vector<StringRef>,
+ Order) {
+ size_t Index = 0;
+ for (Decl *D : Node.decls()) {
+ if (isa<FieldDecl>(D) || isa<IndirectFieldDecl>(D)) {
+ if (auto *ND = cast<NamedDecl>(D)) {
+ if (Index == Order.size())
+ return false;
+ if (ND->getName() != Order[Index])
+ return false;
+ ++Index;
+ }
+ }
+ }
+ return Index == Order.size();
+}
+
TEST_P(ASTImporterOptionSpecificTestBase,
TUshouldContainClassTemplateSpecializationOfExplicitInstantiation) {
Decl *From, *To;
@@ -1493,6 +1510,31 @@
Verifier.match(To, cxxRecordDecl(hasFieldOrder({"a", "b", "c"}))));
}
+TEST_P(ASTImporterOptionSpecificTestBase,
+ CXXRecordDeclFieldAndIndirectFieldOrder) {
+ Decl *From, *To;
+ std::tie(From, To) = getImportedDecl(
+ // First field is "a", then the field for unnamed union, then "b" and "c"
+ // from it, then "d".
+ R"s(
+ struct declToImport {
+ int a = d;
+ union {
+ int b;
+ int c;
+ };
+ int d;
+ };
+ )s",
+ Lang_CXX11, "", Lang_CXX11);
+
+ MatchVerifier<Decl> Verifier;
+ ASSERT_TRUE(Verifier.match(From, cxxRecordDecl(hasFieldIndirectFieldOrder(
+ {"a", "", "b", "c", "d"}))));
+ EXPECT_TRUE(Verifier.match(
+ To, cxxRecordDecl(hasFieldIndirectFieldOrder({"a", "", "b", "c", "d"}))));
+}
+
TEST_P(ASTImporterOptionSpecificTestBase, ShouldImportImplicitCXXRecordDecl) {
Decl *From, *To;
std::tie(From, To) = getImportedDecl(
Index: clang/lib/AST/ASTImporter.cpp
===================================================================
--- clang/lib/AST/ASTImporter.cpp
+++ clang/lib/AST/ASTImporter.cpp
@@ -1701,7 +1701,7 @@
// Remove all declarations, which may be in wrong order in the
// lexical DeclContext and then add them in the proper order.
for (auto *D : FromRD->decls()) {
- if (isa<FieldDecl>(D) || isa<FriendDecl>(D)) {
+ if (isa<FieldDecl>(D) || isa<IndirectFieldDecl>(D) || isa<FriendDecl>(D)) {
assert(D && "DC contains a null decl");
Decl *ToD = Importer.GetAlreadyImportedOrNull(D);
// Remove only the decls which we successfully imported.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D66866.217591.patch
Type: text/x-patch
Size: 2547 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20190828/d4989f9e/attachment.bin>
More information about the cfe-commits
mailing list