replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

llvm-svn: 271199
This commit is contained in:
Haojian Wu 2016-05-30 07:42:22 +00:00
parent 669b44e857
commit 3b9f4cf462
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
clang-tools-extra/clang-tidy/misc/UnusedUsingDeclsCheck.cpp
View File

@ -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::registerMatchers(MatchFinder *Finder) {
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(),

6
clang-tools-extra/test/clang-tidy/misc-unused-using-decls.cpp
View File

@ -33,6 +33,7 @@ template <typename T> int UnusedTemplateFunc() { return 1; }
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() {