[clang-tools-extra] r271199 - Fix a wrong check in misc-unused-using-decls
Haojian Wu via cfe-commits
cfe-commits at lists.llvm.org
Mon May 30 00:42:27 PDT 2016
Author: hokein
Date: Mon May 30 02:42:22 2016
New Revision: 271199
URL: http://llvm.org/viewvc/llvm-project?rev=271199&view=rev
Log:
Fix a wrong check in misc-unused-using-decls
Summary:
We should check whether a UsingDecl is defined in macros or in class
definition, not TargetDecls of the UsingDecl.
Reviewers: alexfh
Subscribers: cfe-commits
Differential Revision: http://reviews.llvm.org/D20666
Modified:
clang-tools-extra/trunk/clang-tidy/misc/UnusedUsingDeclsCheck.cpp
clang-tools-extra/trunk/test/clang-tidy/misc-unused-using-decls.cpp
Modified: clang-tools-extra/trunk/clang-tidy/misc/UnusedUsingDeclsCheck.cpp
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-tidy/misc/UnusedUsingDeclsCheck.cpp?rev=271199&r1=271198&r2=271199&view=diff
==============================================================================
--- clang-tools-extra/trunk/clang-tidy/misc/UnusedUsingDeclsCheck.cpp (original)
+++ clang-tools-extra/trunk/clang-tidy/misc/UnusedUsingDeclsCheck.cpp Mon May 30 02:42:22 2016
@@ -18,20 +18,10 @@ namespace clang {
namespace tidy {
namespace misc {
-// A function that helps to tell whether a TargetDecl will be checked.
-// We only check a TargetDecl if :
-// * The corresponding UsingDecl is not defined in macros or in class
-// definitions.
-// * Only variable, function and class types are considered.
+// A function that helps to tell whether a TargetDecl in a UsingDecl will be
+// checked. Only variable, function, function template, class template and class
+// are considered.
static bool ShouldCheckDecl(const Decl *TargetDecl) {
- // Ignores using-declarations defined in macros.
- if (TargetDecl->getLocation().isMacroID())
- return false;
-
- // Ignores using-declarations defined in class definition.
- if (isa<CXXRecordDecl>(TargetDecl->getDeclContext()))
- return false;
-
return isa<RecordDecl>(TargetDecl) || isa<ClassTemplateDecl>(TargetDecl) ||
isa<FunctionDecl>(TargetDecl) || isa<VarDecl>(TargetDecl) ||
isa<FunctionTemplateDecl>(TargetDecl);
@@ -49,6 +39,14 @@ void UnusedUsingDeclsCheck::registerMatc
void UnusedUsingDeclsCheck::check(const MatchFinder::MatchResult &Result) {
if (const auto *Using = Result.Nodes.getNodeAs<UsingDecl>("using")) {
+ // Ignores using-declarations defined in macros.
+ if (Using->getLocation().isMacroID())
+ return ;
+
+ // Ignores using-declarations defined in class definition.
+ if (isa<CXXRecordDecl>(Using->getDeclContext()))
+ return ;
+
UsingDeclContext Context(Using);
Context.UsingDeclRange = CharSourceRange::getCharRange(
Using->getLocStart(),
Modified: clang-tools-extra/trunk/test/clang-tidy/misc-unused-using-decls.cpp
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-tidy/misc-unused-using-decls.cpp?rev=271199&r1=271198&r2=271199&view=diff
==============================================================================
--- clang-tools-extra/trunk/test/clang-tidy/misc-unused-using-decls.cpp (original)
+++ clang-tools-extra/trunk/test/clang-tidy/misc-unused-using-decls.cpp Mon May 30 02:42:22 2016
@@ -33,6 +33,7 @@ template <typename T> int UnusedTemplate
template <typename T> int UsedInTemplateFunc() { return 1; }
void OverloadFunc(int);
void OverloadFunc(double);
+int FuncUsedByUsingDeclInMacro() { return 1; }
class ostream {
public:
@@ -93,6 +94,11 @@ using n::OverloadFunc; // OverloadFunc
DEFINE_INT(test);
#undef DEFIND_INT
+#define USING_FUNC \
+ using n::FuncUsedByUsingDeclInMacro;
+USING_FUNC
+#undef USING_FUNC
+
// ----- Usages -----
void f(B b);
void g() {
More information about the cfe-commits
mailing list