Author: hokein Date: Wed Feb 15 08:10:50 2017 New Revision: 295178 URL: http://llvm.org/viewvc/llvm-project?rev=295178&view=rev Log: [clang-tidy] Ignore instantiated functions and static data members of classes in misc-definitions-in-headers.
Reviewers: alexfh Reviewed By: alexfh Subscribers: JDevlieghere, cfe-commits Differential Revision: https://reviews.llvm.org/D29957 Modified: clang-tools-extra/trunk/clang-tidy/misc/DefinitionsInHeadersCheck.cpp clang-tools-extra/trunk/test/clang-tidy/misc-definitions-in-headers.hpp Modified: clang-tools-extra/trunk/clang-tidy/misc/DefinitionsInHeadersCheck.cpp URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-tidy/misc/DefinitionsInHeadersCheck.cpp?rev=295178&r1=295177&r2=295178&view=diff ============================================================================== --- clang-tools-extra/trunk/clang-tidy/misc/DefinitionsInHeadersCheck.cpp (original) +++ clang-tools-extra/trunk/clang-tidy/misc/DefinitionsInHeadersCheck.cpp Wed Feb 15 08:10:50 2017 @@ -104,8 +104,8 @@ void DefinitionsInHeadersCheck::check(co // Function templates are allowed. if (FD->getTemplatedKind() == FunctionDecl::TK_FunctionTemplate) return; - // Function template full specialization is prohibited in header file. - if (FD->getTemplateSpecializationKind() == TSK_ImplicitInstantiation) + // Ignore instantiated functions. + if (FD->isTemplateInstantiation()) return; // Member function of a class template and member function of a nested class // in a class template are allowed. @@ -133,7 +133,8 @@ void DefinitionsInHeadersCheck::check(co // Static data members of a class template are allowed. if (VD->getDeclContext()->isDependentContext() && VD->isStaticDataMember()) return; - if (VD->getTemplateSpecializationKind() == TSK_ImplicitInstantiation) + // Ignore instantiated static data members of classes. + if (isTemplateInstantiation(VD->getTemplateSpecializationKind())) return; // Ignore variable definition within function scope. if (VD->hasLocalStorage() || VD->isStaticLocal()) Modified: clang-tools-extra/trunk/test/clang-tidy/misc-definitions-in-headers.hpp URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-tidy/misc-definitions-in-headers.hpp?rev=295178&r1=295177&r2=295178&view=diff ============================================================================== --- clang-tools-extra/trunk/test/clang-tidy/misc-definitions-in-headers.hpp (original) +++ clang-tools-extra/trunk/test/clang-tidy/misc-definitions-in-headers.hpp Wed Feb 15 08:10:50 2017 @@ -71,6 +71,12 @@ void CB<T>::CCB::f3() { template <typename T> int CB<T>::a = 2; // OK: static data member definition of a class template. +template class CB<int>; // OK: explicitly instantiated static data member of a class template. +inline int callCB() { + CB<double> cb; // OK: implicitly instantiated static data member of a class template. + return cb.a; +} + template <typename T> T tf() { // OK: template function definition. T a; @@ -107,6 +113,12 @@ namespace { int f8() = delete; // OK: the function being marked delete is not callable. +template <typename T> +int f9(T t) { return 1; } + +inline void callF9() { f9(1); } // OK: implicitly instantiated function. +template int f9(double); // OK: explicitly instantiated function. + int a = 1; // CHECK-MESSAGES: :[[@LINE-1]]:5: warning: variable 'a' defined in a header file; variable definitions in header files can lead to ODR violations [misc-definitions-in-headers] CA a1; _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits