Author: mgehre Date: Mon May 13 12:21:57 2019 New Revision: 360613 URL: http://llvm.org/viewvc/llvm-project?rev=360613&view=rev Log: [clang-tidy] readability-redundant-declaration: fix false positive with C "extern inline"
Summary: readability-redundant-declaration was diagnosing a redundant declaration on "extern inline void f();", which is needed in C code to force an external definition of the inline function f. (This is different to how inline behaves in C++). Reviewers: alexfh, danielmarjamaki Subscribers: xazax.hun, cfe-commits Tags: #clang Differential Revision: https://reviews.llvm.org/D61700 Added: clang-tools-extra/trunk/test/clang-tidy/readability-redundant-declaration.c Modified: clang-tools-extra/trunk/clang-tidy/readability/RedundantDeclarationCheck.cpp clang-tools-extra/trunk/test/clang-tidy/readability-redundant-declaration.cpp Modified: clang-tools-extra/trunk/clang-tidy/readability/RedundantDeclarationCheck.cpp URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-tidy/readability/RedundantDeclarationCheck.cpp?rev=360613&r1=360612&r2=360613&view=diff ============================================================================== --- clang-tools-extra/trunk/clang-tidy/readability/RedundantDeclarationCheck.cpp (original) +++ clang-tools-extra/trunk/clang-tidy/readability/RedundantDeclarationCheck.cpp Mon May 13 12:21:57 2019 @@ -17,6 +17,10 @@ namespace clang { namespace tidy { namespace readability { +AST_MATCHER(FunctionDecl, doesDeclarationForceExternallyVisibleDefinition) { + return Node.doesDeclarationForceExternallyVisibleDefinition(); +} + RedundantDeclarationCheck::RedundantDeclarationCheck(StringRef Name, ClangTidyContext *Context) : ClangTidyCheck(Name, Context), @@ -25,8 +29,10 @@ RedundantDeclarationCheck::RedundantDecl void RedundantDeclarationCheck::registerMatchers(MatchFinder *Finder) { Finder->addMatcher( namedDecl(anyOf(varDecl(unless(isDefinition())), - functionDecl(unless(anyOf(isDefinition(), isDefaulted(), - hasParent(friendDecl())))))) + functionDecl(unless(anyOf( + isDefinition(), isDefaulted(), + doesDeclarationForceExternallyVisibleDefinition(), + hasParent(friendDecl())))))) .bind("Decl"), this); } Added: clang-tools-extra/trunk/test/clang-tidy/readability-redundant-declaration.c URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-tidy/readability-redundant-declaration.c?rev=360613&view=auto ============================================================================== --- clang-tools-extra/trunk/test/clang-tidy/readability-redundant-declaration.c (added) +++ clang-tools-extra/trunk/test/clang-tidy/readability-redundant-declaration.c Mon May 13 12:21:57 2019 @@ -0,0 +1,31 @@ +// RUN: %check_clang_tidy %s readability-redundant-declaration %t + +extern int Xyz; +extern int Xyz; // Xyz +// CHECK-MESSAGES: :[[@LINE-1]]:12: warning: redundant 'Xyz' declaration [readability-redundant-declaration] +// CHECK-FIXES: {{^}}// Xyz{{$}} +int Xyz = 123; + +extern int A; +extern int A, B; +// CHECK-MESSAGES: :[[@LINE-1]]:12: warning: redundant 'A' declaration +// CHECK-FIXES: {{^}}extern int A, B;{{$}} + +extern int Buf[10]; +extern int Buf[10]; // Buf[10] +// CHECK-MESSAGES: :[[@LINE-1]]:12: warning: redundant 'Buf' declaration +// CHECK-FIXES: {{^}}// Buf[10]{{$}} + +static int f(); +static int f(); // f +// CHECK-MESSAGES: :[[@LINE-1]]:12: warning: redundant 'f' declaration +// CHECK-FIXES: {{^}}// f{{$}} +static int f() {} + +inline void g() {} + +inline void g(); +// CHECK-MESSAGES: :[[@LINE-1]]:13: warning: redundant 'g' declaration + +// OK: Needed to emit an external definition. +extern inline void g(); Modified: clang-tools-extra/trunk/test/clang-tidy/readability-redundant-declaration.cpp URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-tidy/readability-redundant-declaration.cpp?rev=360613&r1=360612&r2=360613&view=diff ============================================================================== --- clang-tools-extra/trunk/test/clang-tidy/readability-redundant-declaration.cpp (original) +++ clang-tools-extra/trunk/test/clang-tidy/readability-redundant-declaration.cpp Mon May 13 12:21:57 2019 @@ -68,3 +68,13 @@ DEFINE(test); // CHECK-FIXES: {{^}}DEFINE(test);{{$}} } // namespace macros + +inline void g() {} + +inline void g(); // g +// CHECK-MESSAGES: :[[@LINE-1]]:13: warning: redundant 'g' declaration +// CHECK-FIXES: {{^}}// g{{$}} + +extern inline void g(); // extern g +// CHECK-MESSAGES: :[[@LINE-1]]:20: warning: redundant 'g' declaration +// CHECK-FIXES: {{^}}// extern g{{$}} _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
