Index: cfe/trunk/unittests/AST/ASTImporterTest.cpp =================================================================== --- cfe/trunk/unittests/AST/ASTImporterTest.cpp +++ cfe/trunk/unittests/AST/ASTImporterTest.cpp @@ -2362,12 +2362,7 @@ 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 @@ (*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( Index: cfe/trunk/unittests/AST/StructuralEquivalenceTest.cpp =================================================================== --- cfe/trunk/unittests/AST/StructuralEquivalenceTest.cpp +++ cfe/trunk/unittests/AST/StructuralEquivalenceTest.cpp @@ -300,8 +300,7 @@ 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));