<div dir="ltr"><br><div class="gmail_extra"><br><br><div class="gmail_quote">On Fri, Aug 29, 2014 at 7:38 AM, Benjamin Kramer <span dir="ltr"><<a href="mailto:benny.kra@googlemail.com" target="_blank">benny.kra@googlemail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: d0k<br>
Date: Fri Aug 29 09:38:46 2014<br>
New Revision: 216726<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=216726&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=216726&view=rev</a><br>
Log:<br>
[clang-tidy] Add a checker that suggests replacing short/long/long long with fixed-size types.<br>
<br>
Differential Revision: <a href="http://reviews.llvm.org/D5119" target="_blank">http://reviews.llvm.org/D5119</a><br>
<br>
Added:<br>
clang-tools-extra/trunk/clang-tidy/google/IntegerTypesCheck.cpp<br>
clang-tools-extra/trunk/clang-tidy/google/IntegerTypesCheck.h<br>
clang-tools-extra/trunk/test/clang-tidy/google-runtime-int.cpp<br>
Modified:<br>
clang-tools-extra/trunk/clang-tidy/google/CMakeLists.txt<br>
clang-tools-extra/trunk/clang-tidy/google/GoogleTidyModule.cpp<br>
<br>
Modified: clang-tools-extra/trunk/clang-tidy/google/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-tidy/google/CMakeLists.txt?rev=216726&r1=216725&r2=216726&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-tidy/google/CMakeLists.txt?rev=216726&r1=216725&r2=216726&view=diff</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/clang-tidy/google/CMakeLists.txt (original)<br>
+++ clang-tools-extra/trunk/clang-tidy/google/CMakeLists.txt Fri Aug 29 09:38:46 2014<br>
@@ -5,6 +5,7 @@ add_clang_library(clangTidyGoogleModule<br>
ExplicitConstructorCheck.cpp<br>
ExplicitMakePairCheck.cpp<br>
GoogleTidyModule.cpp<br>
+ IntegerTypesCheck.cpp<br>
MemsetZeroLengthCheck.cpp<br>
NamedParameterCheck.cpp<br>
OverloadedUnaryAndCheck.cpp<br>
<br>
Modified: clang-tools-extra/trunk/clang-tidy/google/GoogleTidyModule.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-tidy/google/GoogleTidyModule.cpp?rev=216726&r1=216725&r2=216726&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-tidy/google/GoogleTidyModule.cpp?rev=216726&r1=216725&r2=216726&view=diff</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/clang-tidy/google/GoogleTidyModule.cpp (original)<br>
+++ clang-tools-extra/trunk/clang-tidy/google/GoogleTidyModule.cpp Fri Aug 29 09:38:46 2014<br>
@@ -13,6 +13,7 @@<br>
#include "AvoidCStyleCastsCheck.h"<br>
#include "ExplicitConstructorCheck.h"<br>
#include "ExplicitMakePairCheck.h"<br>
+#include "IntegerTypesCheck.h"<br>
#include "MemsetZeroLengthCheck.h"<br>
#include "NamedParameterCheck.h"<br>
#include "OverloadedUnaryAndCheck.h"<br>
@@ -41,6 +42,9 @@ public:<br>
"google-explicit-constructor",<br>
new ClangTidyCheckFactory<ExplicitConstructorCheck>());<br>
CheckFactories.addCheckFactory(<br>
+ "google-runtime-int",<br>
+ new ClangTidyCheckFactory<runtime::IntegerTypesCheck>());<br>
+ CheckFactories.addCheckFactory(<br>
"google-runtime-operator",<br>
new ClangTidyCheckFactory<runtime::OverloadedUnaryAndCheck>());<br>
CheckFactories.addCheckFactory(<br>
<br>
Added: clang-tools-extra/trunk/clang-tidy/google/IntegerTypesCheck.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-tidy/google/IntegerTypesCheck.cpp?rev=216726&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-tidy/google/IntegerTypesCheck.cpp?rev=216726&view=auto</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/clang-tidy/google/IntegerTypesCheck.cpp (added)<br>
+++ clang-tools-extra/trunk/clang-tidy/google/IntegerTypesCheck.cpp Fri Aug 29 09:38:46 2014<br>
@@ -0,0 +1,103 @@<br>
+//===--- IntegerTypesCheck.cpp - clang-tidy -------------------------------===//<br>
+//<br>
+// The LLVM Compiler Infrastructure<br>
+//<br>
+// This file is distributed under the University of Illinois Open Source<br>
+// License. See LICENSE.TXT for details.<br>
+//<br>
+//===----------------------------------------------------------------------===//<br>
+<br>
+#include "IntegerTypesCheck.h"<br>
+#include "clang/AST/ASTContext.h"<br>
+#include "clang/ASTMatchers/ASTMatchers.h"<br>
+#include "clang/ASTMatchers/ASTMatchFinder.h"<br>
+#include "clang/Basic/CharInfo.h"<br>
+#include "clang/Basic/TargetInfo.h"<br>
+<br>
+namespace clang {<br>
+<br>
+namespace ast_matchers {<br>
+const internal::VariadicDynCastAllOfMatcher<Decl, TypedefDecl> typedefDecl;<br>
+} // namespace ast_matchers<br>
+<br>
+namespace tidy {<br>
+namespace runtime {<br>
+<br>
+using namespace ast_matchers;<br>
+<br>
+void IntegerTypesCheck::registerMatchers(MatchFinder *Finder) {<br>
+ // Find all TypeLocs.<br>
+ Finder->addMatcher(typeLoc().bind("tl"), this);<br>
+}<br>
+<br>
+void IntegerTypesCheck::check(const MatchFinder::MatchResult &Result) {<br>
+ auto TL = *Result.Nodes.getNodeAs<TypeLoc>("tl");<br>
+ SourceLocation Loc = TL.getLocStart();<br>
+<br>
+ if (Loc.isMacroID())<br>
+ return;<br>
+<br>
+ // Look through qualification.<br>
+ if (auto QualLoc = TL.getAs<QualifiedTypeLoc>())<br>
+ TL = QualLoc.getUnqualifiedLoc();<br>
+<br>
+ auto BuiltinLoc = TL.getAs<BuiltinTypeLoc>();<br>
+ if (!BuiltinLoc)<br>
+ return;<br>
+<br>
+ bool IsSigned;<br>
+ unsigned Width;<br>
+ const TargetInfo &TargetInfo = Result.Context->getTargetInfo();<br>
+<br>
+ // Look for uses of short, long, long long and their unsigned versions.<br>
+ switch (BuiltinLoc.getTypePtr()->getKind()) {<br>
+ case BuiltinType::Short:<br>
+ Width = TargetInfo.getShortWidth();<br>
+ IsSigned = true;<br>
+ break;<br>
+ case BuiltinType::Long:<br>
+ Width = TargetInfo.getLongWidth();<br>
+ IsSigned = true;<br>
+ break;<br>
+ case BuiltinType::LongLong:<br>
+ Width = TargetInfo.getLongLongWidth();<br>
+ IsSigned = true;<br>
+ break;<br>
+ case BuiltinType::UShort:<br>
+ Width = TargetInfo.getShortWidth();<br>
+ IsSigned = false;<br>
+ break;<br>
+ case BuiltinType::ULong:<br>
+ Width = TargetInfo.getLongWidth();<br>
+ IsSigned = false;<br>
+ break;<br>
+ case BuiltinType::ULongLong:<br>
+ Width = TargetInfo.getLongLongWidth();<br>
+ IsSigned = false;<br>
+ break;<br>
+ default:<br>
+ return;<br>
+ }<br>
+<br>
+ // We allow "unsigned short port" as that's reasonably common and required by<br>
+ // the sockets API.<br>
+ const StringRef Port = "unsigned short port";<br></blockquote><div><br></div><div>Should we really be looking for an exact source-level string here? This seems surprisingly specific. What about cases like:</div>
<div><br></div><div>unsigned short portion_size;</div><div>unsigned short port_in, port_out;</div><div>unsigned short port, something_else;</div><div><br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+ const char *Data = Result.SourceManager->getCharacterData(Loc);<br>
+ if (!std::strncmp(Data, Port.data(), Port.size()) &&<br>
+ !isIdentifierBody(Data[Port.size()]))<br>
+ return;<br>
+<br>
+ std::string Replacement =<br>
+ ((IsSigned ? SignedTypePrefix : UnsignedTypePrefix) + Twine(Width) +<br>
+ (AddUnderscoreT ? "_t" : "")).str();<br>
+<br>
+ // We don't add a fix-it as changing the type can easily break code,<br>
+ // e.g. when a function requires a 'long' argument on all platforms.<br>
+ // QualTypes are printed with implicit quotes.<br>
+ diag(Loc, "consider replacing %0 with '%1'") << BuiltinLoc.getType()<br>
+ << Replacement;<br>
+}<br>
+<br>
+} // namespace runtime<br>
+} // namespace tidy<br>
+} // namespace clang<br>
<br>
Added: clang-tools-extra/trunk/clang-tidy/google/IntegerTypesCheck.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-tidy/google/IntegerTypesCheck.h?rev=216726&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-tidy/google/IntegerTypesCheck.h?rev=216726&view=auto</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/clang-tidy/google/IntegerTypesCheck.h (added)<br>
+++ clang-tools-extra/trunk/clang-tidy/google/IntegerTypesCheck.h Fri Aug 29 09:38:46 2014<br>
@@ -0,0 +1,40 @@<br>
+//===--- IntegerTypesCheck.h - clang-tidy -----------------------*- C++ -*-===//<br>
+//<br>
+// The LLVM Compiler Infrastructure<br>
+//<br>
+// This file is distributed under the University of Illinois Open Source<br>
+// License. See LICENSE.TXT for details.<br>
+//<br>
+//===----------------------------------------------------------------------===//<br>
+<br>
+#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_GOOGLE_INTEGERTYPESCHECK_H<br>
+#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_GOOGLE_INTEGERTYPESCHECK_H<br>
+<br>
+#include "../ClangTidy.h"<br>
+<br>
+namespace clang {<br>
+namespace tidy {<br>
+namespace runtime {<br>
+<br>
+/// \brief Finds uses of short, long and long long and suggest replacing them<br>
+/// with u?intXX(_t)?.<br>
+/// Correspondig cpplint.py check: runtime/int.<br>
+class IntegerTypesCheck : public ClangTidyCheck {<br>
+public:<br>
+ IntegerTypesCheck()<br>
+ : UnsignedTypePrefix("uint"), SignedTypePrefix("int"),<br>
+ AddUnderscoreT(false) {}<br>
+ void registerMatchers(ast_matchers::MatchFinder *Finder) override;<br>
+ void check(const ast_matchers::MatchFinder::MatchResult &Result) override;<br>
+<br>
+private:<br>
+ const StringRef UnsignedTypePrefix;<br>
+ const StringRef SignedTypePrefix;<br>
+ const bool AddUnderscoreT;<br>
+};<br>
+<br>
+} // namespace runtime<br>
+} // namespace tidy<br>
+} // namespace clang<br>
+<br>
+#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_GOOGLE_INTEGERTYPESCHECK_H<br>
<br>
Added: clang-tools-extra/trunk/test/clang-tidy/google-runtime-int.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-tidy/google-runtime-int.cpp?rev=216726&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-tidy/google-runtime-int.cpp?rev=216726&view=auto</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/test/clang-tidy/google-runtime-int.cpp (added)<br>
+++ clang-tools-extra/trunk/test/clang-tidy/google-runtime-int.cpp Fri Aug 29 09:38:46 2014<br>
@@ -0,0 +1,54 @@<br>
+// RUN: clang-tidy -checks=-*,google-runtime-int %s -- -x c++ 2>&1 | FileCheck %s -implicit-check-not='{{warning:|error:}}'<br>
+<br>
+long a();<br>
+// CHECK: [[@LINE-1]]:1: warning: consider replacing 'long' with 'int64'<br>
+<br>
+typedef unsigned long long uint64; // NOLINT<br>
+<br>
+long b(long = 1);<br>
+// CHECK: [[@LINE-1]]:1: warning: consider replacing 'long' with 'int64'<br>
+// CHECK: [[@LINE-2]]:8: warning: consider replacing 'long' with 'int64'<br>
+<br>
+template <typename T><br>
+void tmpl() {<br>
+ T i;<br>
+}<br>
+<br>
+short bar(const short, unsigned short) {<br>
+// CHECK: [[@LINE-1]]:1: warning: consider replacing 'short' with 'int16'<br>
+// CHECK: [[@LINE-2]]:17: warning: consider replacing 'short' with 'int16'<br>
+// CHECK: [[@LINE-3]]:24: warning: consider replacing 'unsigned short' with 'uint16'<br>
+ long double foo = 42;<br>
+ uint64 qux = 42;<br>
+ unsigned short port;<br>
+<br>
+ const unsigned short bar = 0;<br>
+// CHECK: [[@LINE-1]]:9: warning: consider replacing 'unsigned short' with 'uint16'<br>
+ long long *baar;<br>
+// CHECK: [[@LINE-1]]:3: warning: consider replacing 'long long' with 'int64'<br>
+ const unsigned short &bara = bar;<br>
+// CHECK: [[@LINE-1]]:9: warning: consider replacing 'unsigned short' with 'uint16'<br>
+ long const long moo = 1;<br>
+// CHECK: [[@LINE-1]]:3: warning: consider replacing 'long long' with 'int64'<br>
+ long volatile long wat = 42;<br>
+// CHECK: [[@LINE-1]]:3: warning: consider replacing 'long long' with 'int64'<br>
+ unsigned long y;<br>
+// CHECK: [[@LINE-1]]:3: warning: consider replacing 'unsigned long' with 'uint64'<br>
+ unsigned long long **const *tmp;<br>
+// CHECK: [[@LINE-1]]:3: warning: consider replacing 'unsigned long long' with 'uint64'<br>
+ unsigned long long **const *&z = tmp;<br>
+// CHECK: [[@LINE-1]]:3: warning: consider replacing 'unsigned long long' with 'uint64'<br>
+ unsigned short porthole;<br>
+// CHECK: [[@LINE-1]]:3: warning: consider replacing 'unsigned short' with 'uint16'<br>
+<br>
+#define l long<br>
+ l x;<br>
+<br>
+ tmpl<short>();<br>
+// CHECK: [[@LINE-1]]:8: warning: consider replacing 'short' with 'int16'<br>
+}<br>
+<br>
+void qux() {<br>
+ short port;<br>
+// CHECK: [[@LINE-1]]:3: warning: consider replacing 'short' with 'int16'<br>
+}<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu">cfe-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div></div>