From 7111c842e8a6d2254992c97ccad307dfd7ba1166 Mon Sep 17 00:00:00 2001 From: Gabor Marton Date: Mon, 20 May 2019 10:38:14 +0000 Subject: [PATCH] [ASTImporter] Enable disabled but passing tests Reviewers: a_sidorin, a.sidorin, shafik Subscribers: rnkovacs, dkrupp, Szelethus, gamesh411, cfe-commits Tags: #clang Differential Revision: https://reviews.llvm.org/D62066 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@361139 91177308-0d34-0410-b5e6-96231b3b80d8 --- unittests/AST/ASTImporterTest.cpp | 13 ++----------- unittests/AST/StructuralEquivalenceTest.cpp | 3 +-- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/unittests/AST/ASTImporterTest.cpp b/unittests/AST/ASTImporterTest.cpp index 72ff3be03c..02cfaad91e 100644 --- a/unittests/AST/ASTImporterTest.cpp +++ b/unittests/AST/ASTImporterTest.cpp @@ -2362,12 +2362,7 @@ TEST_P(ImportFriendFunctions, EXPECT_EQ(ToFD->getPreviousDecl(), ImportedD); } -// Disabled temporarily, because the new structural equivalence check -// (https://reviews.llvm.org/D48628) breaks it. -// PreviousDecl is not set because there is no structural match. -// FIXME Enable! -TEST_P(ImportFriendFunctions, - DISABLED_ImportFriendFunctionRedeclChainDefWithClass) { +TEST_P(ImportFriendFunctions, ImportFriendFunctionRedeclChainDefWithClass) { auto Pattern = functionDecl(hasName("f")); Decl *FromTU = getTuDecl( @@ -2395,12 +2390,8 @@ TEST_P(ImportFriendFunctions, (*ImportedD->param_begin())->getOriginalType()); } -// Disabled temporarily, because the new structural equivalence check -// (https://reviews.llvm.org/D48628) breaks it. -// PreviousDecl is not set because there is no structural match. -// FIXME Enable! TEST_P(ImportFriendFunctions, - DISABLED_ImportFriendFunctionRedeclChainDefWithClass_ImportTheProto) { + ImportFriendFunctionRedeclChainDefWithClass_ImportTheProto) { auto Pattern = functionDecl(hasName("f")); Decl *FromTU = getTuDecl( diff --git a/unittests/AST/StructuralEquivalenceTest.cpp b/unittests/AST/StructuralEquivalenceTest.cpp index 5bb4f7e122..414cd8d56b 100644 --- a/unittests/AST/StructuralEquivalenceTest.cpp +++ b/unittests/AST/StructuralEquivalenceTest.cpp @@ -300,8 +300,7 @@ TEST_F(StructuralEquivalenceFunctionTest, ThrowVsNoexceptTrue) { EXPECT_FALSE(testStructuralMatch(t)); } -TEST_F(StructuralEquivalenceFunctionTest, DISABLED_NoexceptNonMatch) { - // The expression is not checked yet. +TEST_F(StructuralEquivalenceFunctionTest, NoexceptNonMatch) { auto t = makeNamedDecls("void foo() noexcept(false);", "void foo() noexcept(true);", Lang_CXX11); EXPECT_FALSE(testStructuralMatch(t)); -- 2.40.0