// 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.
AST_MATCHER_P(RecordDecl, hasFieldOrder, std::vector<StringRef>, Order) {
size_t Index = 0;
- for (FieldDecl *Field : Node.fields()) {
- if (Index == Order.size())
- return false;
- if (Field->getName() != Order[Index])
- return false;
- ++Index;
+ for (Decl *D : Node.decls()) {
+ if (isa<FieldDecl>(D) || isa<IndirectFieldDecl>(D)) {
+ auto *ND = cast<NamedDecl>(D);
+ if (Index == Order.size())
+ return false;
+ if (ND->getName() != Order[Index])
+ return false;
+ ++Index;
+ }
}
return Index == Order.size();
}
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 (indirect fields), 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(hasFieldOrder({"a", "", "b", "c", "d"}))));
+ EXPECT_TRUE(Verifier.match(
+ To, cxxRecordDecl(hasFieldOrder({"a", "", "b", "c", "d"}))));
+}
+
TEST_P(ASTImporterOptionSpecificTestBase, ShouldImportImplicitCXXRecordDecl) {
Decl *From, *To;
std::tie(From, To) = getImportedDecl(