commit 8861152f1b7a126badde34af21527c010605edb6
author Kadir Cetinkaya <kadircet@google.com> Thu Sep 05 08:11:21 2019 +0000
committer Kadir Cetinkaya <kadircet@google.com> Thu Sep 05 08:11:21 2019 +0000
tree 375e039023e2c3868d20f21022d6b7565ad04caf
parent 7bcec8c206dc94a0f463aea1198a9549a21ded30

[clang-tidy] Fix definitions in headers check to respect qualifiers

Summary:
The check was generating a fix without taking qualifiers in return type
into account. This patch changes the insertion location to be before qualifers.

Reviewers: gribozavr

Subscribers: xazax.hun, cfe-commits

Tags: #clang

Differential Revision: https://reviews.llvm.org/D67213

git-svn-id: https://llvm.org/svn/llvm-project/clang-tools-extra/trunk@371022 91177308-0d34-0410-b5e6-96231b3b80d8

clang-tidy/misc/DefinitionsInHeadersCheck.cpp

diff --git a/clang-tidy/misc/DefinitionsInHeadersCheck.cpp b/clang-tidy/misc/DefinitionsInHeadersCheck.cpp
index a496e3b..1d41edd 100644
--- a/clang-tidy/misc/DefinitionsInHeadersCheck.cpp
+++ b/clang-tidy/misc/DefinitionsInHeadersCheck.cpp
@@ -132,8 +132,7 @@
         << IsFullSpec << FD;
     diag(FD->getLocation(), /*FixDescription=*/"make as 'inline'",
          DiagnosticIDs::Note)
-        << FixItHint::CreateInsertion(FD->getReturnTypeSourceRange().getBegin(),
-                                      "inline ");
+        << FixItHint::CreateInsertion(FD->getInnerLocStart(), "inline ");
   } else if (const auto *VD = dyn_cast<VarDecl>(ND)) {
     // Static data members of a class template are allowed.
     if (VD->getDeclContext()->isDependentContext() && VD->isStaticDataMember())

test/clang-tidy/misc-definitions-in-headers.hpp

diff --git a/test/clang-tidy/misc-definitions-in-headers.hpp b/test/clang-tidy/misc-definitions-in-headers.hpp
index 662b061..25009eb 100644
--- a/test/clang-tidy/misc-definitions-in-headers.hpp
+++ b/test/clang-tidy/misc-definitions-in-headers.hpp
@@ -180,3 +180,15 @@
 constexpr int k = 1; // OK: constexpr variable has internal linkage.
 
 constexpr int f10() { return 0; } // OK: constexpr function definition.
+
+const int f11() { return 0; }
+// CHECK-MESSAGES: :[[@LINE-1]]:11: warning: function 'f11' defined in a header file;
+// CHECK-FIXES: inline const int f11() { return 0; }
+
+template <typename T>
+const T f12();
+
+template <>
+const int f12() { return 0; }
+// CHECK-MESSAGES: :[[@LINE-1]]:11: warning: full function template specialization 'f12<int>' defined in a header file;
+// CHECK-FIXES: inline const int f12() { return 0; }