[ASTImporter] Import additional flags for functions.

[balazske]

Summary

At AST import of function delcarations import the flags for defaulted
and deleted.

[martong]

LGTM, but I don't exactly see how the first test is related. Could you please explain?

clang/unittests/AST/ASTImporterTest.cpp

5239 ↗

(On Diff #214341)

I don't exactly see how this test is related.

[balazske]

clang/unittests/AST/ASTImporterTest.cpp

5239 ↗

(On Diff #214341)

I do not remember exactly why this test was added but probably the problem is structural equivalence related: The flags are not imported correctly for the first time, and at the second import structural match fails and a new Decl is created instead of returning the existing one. This test fails if the change is not applied.

[a_sidorin]

Hello Balazs,
The patch looks good in general.

clang/unittests/AST/ASTImporterTest.cpp

5239 ↗

(On Diff #214341)

Should we consider isExplicitlyDefaulted() when computing structural equivalence?

5242 ↗

(On Diff #214341)

const char * -> StringRef?

5246 ↗

(On Diff #214341)

Can we remove the function body or reduce it to 'X x'?

[balazske]

clang/unittests/AST/ASTImporterTest.cpp

5239 ↗

(On Diff #214341)

We may use isExplicitlyDefaulted and isDeletedAsWritten and isVirtualAsWritten but in another patch.

5246 ↗

(On Diff #214341)

The delete x3 is needed to get a destructor for X generated. But the test is about testing the implicit functions and I think it is better to have more of them. This code is there to have these functions generated so I do not like remove of it.

[balazske]

• Using StringRef, added comment.

[balazske]

clang/unittests/AST/ASTImporterTest.cpp

5239 ↗

(On Diff #214341)

It can be good to add check for isExplicitlyDefaulted because it is a separate bit and not checked yet. Probably in another patch that has a test for this too.

[a_sidorin]

Hi Balazs,
The change looks good. I think it can be committed after an unrelated part is removed.

clang/unittests/AST/ASTImporterTest.cpp

5373 ↗

(On Diff #214585)

This is a separate functional change and I prefer to move it into a separate patch.

[balazske]

• Moved SVEBuiltins test instantiation to non-different position.

[balazske]

clang/unittests/AST/ASTImporterTest.cpp

5373 ↗

(On Diff #214585)

This change came in at a rebase to newest master, I wanted to have this instantiation at the end of the list but this showed up as part of the patch so it was moved now back to the start of the list (of all test instantiations).

cfe/trunk/lib/AST/ASTImporter.cpp

ExpectedDecl ASTNodeImporter::VisitFunctionDecl(FunctionDecl *D) {
   }
 
   ToFunction->setQualifierInfo(ToQualifierLoc);
   ToFunction->setAccess(D->getAccess());
   ToFunction->setLexicalDeclContext(LexicalDC);
   ToFunction->setVirtualAsWritten(D->isVirtualAsWritten());
   ToFunction->setTrivial(D->isTrivial());
   ToFunction->setPure(D->isPure());
+  ToFunction->setDefaulted(D->isDefaulted());
+  ToFunction->setExplicitlyDefaulted(D->isExplicitlyDefaulted());
+  ToFunction->setDeletedAsWritten(D->isDeletedAsWritten());
   ToFunction->setRangeEnd(ToEndLoc);
 
   // Set the parameters.
   for (auto *Param : Parameters) {
     Param->setOwningFunction(ToFunction);
     ToFunction->addDeclInternal(Param);
   }
   ToFunction->setParams(Parameters);

cfe/trunk/unittests/AST/ASTImporterTest.cpp

auto *FromTypedef = FirstDeclMatcher<TypedefDecl>().match(
       FromTU, typedefDecl(hasName(TypeName)));
     QualType FromType = FromTypedef->getUnderlyingType();
 
     QualType ImportedType = ImportType(FromType, FromTypedef, Lang_CXX);
     EXPECT_EQ(ImportedType, ToType);
   }
 }
 
+TEST_P(ASTImporterOptionSpecificTestBase, ImportOfDefaultImplicitFunctions) {
+  // Test that import of implicit functions works and the functions
+  // are merged into one chain.
+  auto GetDeclToImport = [this](StringRef File) {
+    Decl *FromTU = getTuDecl(
+        R"(
+        struct X { };
+        // Force generating some implicit operator definitions for X.
+        void f() { X x1, x2; x1 = x2; X *x3 = new X; delete x3; }
+        )",
+        Lang_CXX11, File);
+    auto *FromD = FirstDeclMatcher<CXXRecordDecl>().match(
+        FromTU, cxxRecordDecl(hasName("X"), unless(isImplicit())));
+    // Destructor is picked as one example of implicit function.
+    return FromD->getDestructor();
+  };
+
+  auto *ToD1 = Import(GetDeclToImport("input1.cc"), Lang_CXX11);
+  ASSERT_TRUE(ToD1);
+
+  auto *ToD2 = Import(GetDeclToImport("input2.cc"), Lang_CXX11);
+  ASSERT_TRUE(ToD2);
+
+  EXPECT_EQ(ToD1->getCanonicalDecl(), ToD2->getCanonicalDecl());
+}
+
+TEST_P(ASTImporterOptionSpecificTestBase,
+       ImportOfExplicitlyDefaultedOrDeleted) {
+  Decl *FromTU = getTuDecl(
+      R"(
+        struct X { X() = default; X(const X&) = delete; };
+      )",
+      Lang_CXX11);
+  auto *FromX = FirstDeclMatcher<CXXRecordDecl>().match(
+      FromTU, cxxRecordDecl(hasName("X")));
+  auto *ImportedX = Import(FromX, Lang_CXX11);
+  auto *Constr1 = FirstDeclMatcher<CXXConstructorDecl>().match(
+      ImportedX, cxxConstructorDecl(hasName("X"), unless(isImplicit())));
+  auto *Constr2 = LastDeclMatcher<CXXConstructorDecl>().match(
+      ImportedX, cxxConstructorDecl(hasName("X"), unless(isImplicit())));
+
+  ASSERT_TRUE(ImportedX);
+  EXPECT_TRUE(Constr1->isDefaulted());
+  EXPECT_TRUE(Constr1->isExplicitlyDefaulted());
+  EXPECT_TRUE(Constr2->isDeletedAsWritten());
+  EXPECT_EQ(ImportedX->isAggregate(), FromX->isAggregate());
+}
+
 INSTANTIATE_TEST_CASE_P(ParameterizedTests, SVEBuiltins,
                         ::testing::Values(ArgVector{"-target",
                                                     "aarch64-linux-gnu"}), );
 
 INSTANTIATE_TEST_CASE_P(ParameterizedTests, ASTImporterLookupTableTest,
                         DefaultTestValuesForRunOptions, );
 
 INSTANTIATE_TEST_CASE_P(ParameterizedTests, ImportPath,
INSTANTIATE_TEST_CASE_P(ParameterizedTests, ImportImplicitMethods,
                         DefaultTestValuesForRunOptions, );
 
 INSTANTIATE_TEST_CASE_P(ParameterizedTests, ImportVariables,
                         DefaultTestValuesForRunOptions, );
 
 INSTANTIATE_TEST_CASE_P(ParameterizedTests, LLDBLookupTest,
                         DefaultTestValuesForRunOptions, );
 
+
 } // end namespace ast_matchers
 } // end namespace clang