From: Haojian Wu Date: Wed, 13 Jul 2016 13:55:29 +0000 (+0000) Subject: [clang-tidy] Fix misc-definitions-in-headers misplaced fixing to fully templated... X-Git-Tag: llvmorg-3.9.0-rc1~607 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0b067c12526975e90e940085f6665deefd6789f1;p=platform%2Fupstream%2Fllvm.git [clang-tidy] Fix misc-definitions-in-headers misplaced fixing to fully templated function. Reviewers: alexfh, aaron.ballman Subscribers: cfe-commits Differential Revision: http://reviews.llvm.org/D22260 llvm-svn: 275263 --- diff --git a/clang-tools-extra/clang-tidy/misc/DefinitionsInHeadersCheck.cpp b/clang-tools-extra/clang-tidy/misc/DefinitionsInHeadersCheck.cpp index 25fc092..77ca26f 100644 --- a/clang-tools-extra/clang-tidy/misc/DefinitionsInHeadersCheck.cpp +++ b/clang-tools-extra/clang-tidy/misc/DefinitionsInHeadersCheck.cpp @@ -126,8 +126,8 @@ void DefinitionsInHeadersCheck::check(const MatchFinder::MatchResult &Result) { diag(FD->getLocation(), "function %0 defined in a header file; " "function definitions in header files can lead to ODR violations") - << FD << FixItHint::CreateInsertion(FD->getSourceRange().getBegin(), - "inline "); + << FD << FixItHint::CreateInsertion( + FD->getReturnTypeSourceRange().getBegin(), "inline "); } else if (const auto *VD = dyn_cast(ND)) { // Static data members of a class template are allowed. if (VD->getDeclContext()->isDependentContext() && VD->isStaticDataMember()) diff --git a/clang-tools-extra/test/clang-tidy/misc-definitions-in-headers.hpp b/clang-tools-extra/test/clang-tidy/misc-definitions-in-headers.hpp index 9a383e1..1c9c96e 100644 --- a/clang-tools-extra/test/clang-tidy/misc-definitions-in-headers.hpp +++ b/clang-tools-extra/test/clang-tidy/misc-definitions-in-headers.hpp @@ -29,6 +29,7 @@ void CA::f2() { } template <> int CA::f3() { // CHECK-MESSAGES: :[[@LINE-1]]:9: warning: function 'f3' defined in a header file; +// CHECK-FIXES: inline int CA::f3() { int a = 1; return a; } @@ -90,8 +91,9 @@ T f3() { } template <> -// CHECK-MESSAGES: :[[@LINE+1]]:5: warning: function 'f3' defined in a header file; int f3() { +// CHECK-MESSAGES: :[[@LINE-1]]:5: warning: function 'f3' defined in a header file; +// CHECK-FIXES: inline int f3() { int a = 1; return a; } @@ -153,6 +155,7 @@ struct CD { int CD::f() { // CHECK-MESSAGES: :[[@LINE-1]]:19: warning: function 'f' defined in a header file; +// CHECK-FIXES: inline int CD::f() { return 0; }