Author: jlebar Date: Fri Oct 21 15:13:39 2016 New Revision: 284873 URL: http://llvm.org/viewvc/llvm-project?rev=284873&view=rev Log: [clang-tidy] Don't use a SmallSetVector of an enum.
Summary: This doesn't work after converting SmallSetVector to use DenseSet. Instead we can just use a SmallVector. Reviewers: timshen Subscribers: nemanjai, cfe-commits Differential Revision: https://reviews.llvm.org/D25647 Modified: clang-tools-extra/trunk/clang-tidy/cppcoreguidelines/SpecialMemberFunctionsCheck.cpp clang-tools-extra/trunk/clang-tidy/cppcoreguidelines/SpecialMemberFunctionsCheck.h Modified: clang-tools-extra/trunk/clang-tidy/cppcoreguidelines/SpecialMemberFunctionsCheck.cpp URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-tidy/cppcoreguidelines/SpecialMemberFunctionsCheck.cpp?rev=284873&r1=284872&r2=284873&view=diff ============================================================================== --- clang-tools-extra/trunk/clang-tidy/cppcoreguidelines/SpecialMemberFunctionsCheck.cpp (original) +++ clang-tools-extra/trunk/clang-tidy/cppcoreguidelines/SpecialMemberFunctionsCheck.cpp Fri Oct 21 15:13:39 2016 @@ -97,8 +97,13 @@ void SpecialMemberFunctionsCheck::check( {"move-assign", SpecialMemberFunctionKind::MoveAssignment}}; for (const auto &KV : Matchers) - if (Result.Nodes.getNodeAs<CXXMethodDecl>(KV.first)) - ClassWithSpecialMembers[ID].insert(KV.second); + if (Result.Nodes.getNodeAs<CXXMethodDecl>(KV.first)) { + SpecialMemberFunctionKind Kind = KV.second; + llvm::SmallVectorImpl<SpecialMemberFunctionKind> &Members = + ClassWithSpecialMembers[ID]; + if (find(Members, Kind) == Members.end()) + Members.push_back(Kind); + } } void SpecialMemberFunctionsCheck::onEndOfTranslationUnit() { @@ -125,7 +130,7 @@ void SpecialMemberFunctionsCheck::onEndO std::back_inserter(UndefinedSpecialMembers)); diag(C.first.first, "class '%0' defines %1 but does not define %2") - << C.first.second << join(DefinedSpecialMembers.getArrayRef(), " and ") + << C.first.second << join(DefinedSpecialMembers, " and ") << join(UndefinedSpecialMembers, " or "); } } Modified: clang-tools-extra/trunk/clang-tidy/cppcoreguidelines/SpecialMemberFunctionsCheck.h URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-tidy/cppcoreguidelines/SpecialMemberFunctionsCheck.h?rev=284873&r1=284872&r2=284873&view=diff ============================================================================== --- clang-tools-extra/trunk/clang-tidy/cppcoreguidelines/SpecialMemberFunctionsCheck.h (original) +++ clang-tools-extra/trunk/clang-tidy/cppcoreguidelines/SpecialMemberFunctionsCheck.h Fri Oct 21 15:13:39 2016 @@ -31,7 +31,7 @@ public: void check(const ast_matchers::MatchFinder::MatchResult &Result) override; void onEndOfTranslationUnit() override; - enum class SpecialMemberFunctionKind { + enum class SpecialMemberFunctionKind : uint8_t { Destructor, CopyConstructor, CopyAssignment, @@ -43,7 +43,7 @@ public: using ClassDefiningSpecialMembersMap = llvm::DenseMap<ClassDefId, - llvm::SmallSetVector<SpecialMemberFunctionKind, 5>>; + llvm::SmallVector<SpecialMemberFunctionKind, 5>>; private: ClassDefiningSpecialMembersMap ClassWithSpecialMembers; _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits