[ASTImporter][NFC] Improve test coverage

[steakhal]

Summary

All three cases were imported correctly.
For BlockDecls, correctly means that we don't support importing them, thus an error is the expected behaviour.

• BlockDecls were not yet covered. I know that they are not imported but the test at least documents it.
• Default values for ParmVarDecls were also uncovered.
• Importing bitfield FieldDecls were imported correctly.

[martong]

LGTM! Thanks!

[shafik]

Thank you for adding these tests! LGTM

clang/unittests/AST/ASTImporterTest.cpp

3078

Can we also check they type of the bitfield?

[thakis]

clang/unittests/AST/ASTImporterTest.cpp

3089

Does this have to be a global? It can just be in the TEST_P, no?

As-is, this causes linker errors: http://45.33.8.238/linux/43089/step_4.txt

If it does have to be a global for some reason, please put it in an unnamed namespace.

[steakhal]

clang/unittests/AST/ASTImporterTest.cpp

3089

Hmm I don't know. I was just copy-pasting from for example line 515.

const internal::VariadicDynCastAllOfMatcher<Expr, VAArgExpr> vaArgExpr;

How is my case different from that?
I thought it's the way of doing this.

[thakis]

clang/unittests/AST/ASTImporterTest.cpp

3089

I think the vaArgExpr on line 515 could be local to the ImportVAArgExpr test too.

What's different with your test is that ASTMatchersInternal.cpp already has a global symbol called blockDecl, leading to a duplicate symbol error.

…actually I guess you could just use that one? I think you can just delete the blockDecl line completely and things will probably be fine.

[steakhal]

clang/unittests/AST/ASTImporterTest.cpp

3089

I pushed the change. I hope it fixes the issue.
I don't know how I missed it. Thanks for the heads up.

[steakhal]

clang/unittests/AST/ASTImporterTest.cpp

3089

@thakis How did the premerge test pass then?
That supposed to catch build bot issues before the revision lands, am I right?

[thakis]

Thanks, that bot is happy again.

clang/unittests/AST/ASTImporterTest.cpp

3089

It probably only tests on config. Might depend on if dead code stripping is enabled (?)

clang/unittests/AST/ASTImporterTest.cpp

Decl *ToF2;
     Decl *FromTU = getTuDecl("struct A { int x; };", Lang_CXX03, "input1.cc");
     auto *FromF = FirstDeclMatcher<FieldDecl>().match(
         FromTU, fieldDecl(hasName("x")));
     ToF2 = Import(FromF, Lang_CXX03);
   }
   EXPECT_EQ(ToF1, ToF2);
 }
 
+TEST_P(ASTImporterOptionSpecificTestBase, ImportBitfields) {
+  Decl *FromTU = getTuDecl("struct A { unsigned x : 3; };", Lang_CXX03);
+  auto *FromF =
+      FirstDeclMatcher<FieldDecl>().match(FromTU, fieldDecl(hasName("x")));
+
+  ASSERT_TRUE(FromF->isBitField());
+  ASSERT_EQ(3u, FromF->getBitWidthValue(FromTU->getASTContext()));
+  auto *ToField = Import(FromF, Lang_CXX03);
+  auto *ToTU = ToField->getTranslationUnitDecl();
+
+  EXPECT_TRUE(ToField->isBitField());
+  EXPECT_EQ(3u, ToField->getBitWidthValue(ToTU->getASTContext()));
+
+  const auto *FromBT = FromF->getBitWidth()->getType()->getAs<BuiltinType>();
+  const auto *ToBT = ToField->getBitWidth()->getType()->getAs<BuiltinType>();
+  ASSERT_TRUE(FromBT);
+  ASSERT_EQ(BuiltinType::Int, FromBT->getKind());
+  EXPECT_TRUE(ToBT);
+  EXPECT_EQ(BuiltinType::Int, ToBT->getKind());
+}
+
+struct ImportBlock : ASTImporterOptionSpecificTestBase {};
+const internal::VariadicDynCastAllOfMatcher<Decl, BlockDecl> blockDecl;
+TEST_P(ImportBlock, ImportBlocksAreUnsupported) {
+  const auto *Code = R"(
+    void test_block__capture_null() {
+      int *p = 0;
+      ^(){
+        *p = 1;
+      }();
+    })";
+  Decl *FromTU = getTuDecl(Code, Lang_CXX03);
+  auto *FromBlock = FirstDeclMatcher<BlockDecl>().match(FromTU, blockDecl());
+  ASSERT_TRUE(FromBlock);
+
+  auto ToBlockOrError = importOrError(FromBlock, Lang_CXX03);
+
+  const auto ExpectUnsupportedConstructError = [](const ImportError &Error) {
+    EXPECT_EQ(ImportError::UnsupportedConstruct, Error.Error);
+  };
+  llvm::handleAllErrors(ToBlockOrError.takeError(),
+                        ExpectUnsupportedConstructError);
+}
+
+TEST_P(ASTImporterOptionSpecificTestBase, ImportParmVarDecl) {
+  const auto *Code = R"(
+    template <typename T> struct Wrapper {
+      Wrapper(T Value = {}) {}
+    };
+    template class Wrapper<int>;
+    )";
+  Decl *FromTU = getTuDecl(Code, Lang_CXX11);
+  auto *FromVar = FirstDeclMatcher<ParmVarDecl>().match(
+      FromTU, parmVarDecl(hasType(asString("int"))));
+  ASSERT_TRUE(FromVar);
+  ASSERT_TRUE(FromVar->hasUninstantiatedDefaultArg());
+  ASSERT_TRUE(FromVar->getUninstantiatedDefaultArg());
+
+  const auto *ToVar = Import(FromVar, Lang_CXX11);
+  EXPECT_TRUE(ToVar);
+  EXPECT_TRUE(ToVar->hasUninstantiatedDefaultArg());
+  EXPECT_TRUE(ToVar->getUninstantiatedDefaultArg());
+  EXPECT_NE(FromVar->getUninstantiatedDefaultArg(),
+            ToVar->getUninstantiatedDefaultArg());
+}
+
 TEST_P(ASTImporterOptionSpecificTestBase, ImportOfNonEquivalentField) {
   Decl *ToF1;
   {
     Decl *FromTU = getTuDecl("struct A { int x; };", Lang_CXX03, "input0.cc");
     auto *FromF = FirstDeclMatcher<FieldDecl>().match(
         FromTU, fieldDecl(hasName("x")));
     ToF1 = Import(FromF, Lang_CXX03);
   }

 INSTANTIATE_TEST_CASE_P(ParameterizedTests, ImportExpr,
                         DefaultTestValuesForRunOptions, );
 
 INSTANTIATE_TEST_CASE_P(ParameterizedTests, ImportFixedPointExpr,
                         ExtendWithOptions(DefaultTestArrayForRunOptions,
                                           std::vector<std::string>{
                                               "-ffixed-point"}), );
 
+INSTANTIATE_TEST_CASE_P(ParameterizedTests, ImportBlock,
+                        ExtendWithOptions(DefaultTestArrayForRunOptions,
+                                          std::vector<std::string>{
+                                              "-fblocks"}), );
+
 INSTANTIATE_TEST_CASE_P(ParameterizedTests, ImportType,
                         DefaultTestValuesForRunOptions, );
 
 INSTANTIATE_TEST_CASE_P(ParameterizedTests, ImportDecl,
                         DefaultTestValuesForRunOptions, );
 
 INSTANTIATE_TEST_CASE_P(ParameterizedTests, ASTImporterOptionSpecificTestBase,
                         DefaultTestValuesForRunOptions, );