axzhang updated this revision to Diff 194435.
axzhang marked an inline comment as not done.
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D55044/new/
https://reviews.llvm.org/D55044
Files:
clang-tidy/abseil/AbseilTidyModule.cpp
clang-tidy/modernize/MakeSmartPtrCheck.cpp
clang-tidy/modernize/MakeSmartPtrCheck.h
docs/ReleaseNotes.rst
docs/clang-tidy/checks/abseil-make-unique.rst
docs/clang-tidy/checks/list.rst
docs/clang-tidy/checks/modernize-make-unique.rst
test/clang-tidy/abseil-make-unique.cpp
Index: test/clang-tidy/abseil-make-unique.cpp
===================================================================
--- /dev/null
+++ test/clang-tidy/abseil-make-unique.cpp
@@ -0,0 +1,127 @@
+// RUN: %check_clang_tidy %s abseil-make-unique %t -- -- -std=c++11 \
+
+namespace std {
+
+template <typename T>
+class default_delete {};
+
+template <typename type, typename Deleter = std::default_delete<type>>
+class unique_ptr {
+public:
+ unique_ptr() {}
+ unique_ptr(type *ptr) {}
+ unique_ptr(const unique_ptr<type> &t) = delete;
+ unique_ptr(unique_ptr<type> &&t) {}
+ ~unique_ptr() {}
+ type &operator*() { return *ptr; }
+ type *operator->() { return ptr; }
+ type *release() { return ptr; }
+ void reset() {}
+ void reset(type *pt) {}
+ void reset(type pt) {}
+ unique_ptr &operator=(unique_ptr &&) { return *this; }
+ template <typename T>
+ unique_ptr &operator=(unique_ptr<T> &&) { return *this; }
+
+private:
+ type *ptr;
+};
+
+} // namespace std
+
+class A {
+ int x;
+ int y;
+
+ public:
+ A(int _x, int _y): x(_x), y(_y) {}
+};
+
+struct Base {
+ Base();
+};
+
+struct Derived : public Base {
+ Derived();
+};
+
+int* returnPointer();
+void expectPointer(std::unique_ptr<int> p);
+
+std::unique_ptr<int> makeAndReturnPointer() {
+ return std::unique_ptr<int>(new int(0));
+ // CHECK-MESSAGES: :[[@LINE-1]]:10: warning: use absl::make_unique instead [abseil-make-unique]
+ // CHECK-FIXES: return absl::make_unique<int>(0);
+}
+
+void Positives() {
+ std::unique_ptr<int> P1 = std::unique_ptr<int>(new int(1));
+ // CHECK-MESSAGES: :[[@LINE-1]]:29: warning: use absl::make_unique instead [abseil-make-unique]
+ // CHECK-FIXES: std::unique_ptr<int> P1 = absl::make_unique<int>(1);
+
+ P1.reset(new int(2));
+ // CHECK-MESSAGES: :[[@LINE-1]]:6: warning: use absl::make_unique instead [abseil-make-unique]
+ // CHECK-FIXES: P1 = absl::make_unique<int>(2);
+
+ // Non-primitive paramter
+ std::unique_ptr<A> P2 = std::unique_ptr<A>(new A(1, 2));
+ // CHECK-MESSAGES: :[[@LINE-1]]:27: warning: use absl::make_unique instead [abseil-make-unique]
+ // CHECK-FIXES: std::unique_ptr<A> P2 = absl::make_unique<A>(1, 2);
+
+ P2.reset(new A(3, 4));
+ // CHECK-MESSAGES: :[[@LINE-1]]:6: warning: use absl::make_unique instead [abseil-make-unique]
+ // CHECK-FIXES: P2 = absl::make_unique<A>(3, 4);
+
+ // No arguments to new expression
+ std::unique_ptr<int> P3 = std::unique_ptr<int>(new int);
+ // CHECK-MESSAGES: :[[@LINE-1]]:29: warning: use absl::make_unique instead [abseil-make-unique]
+ // CHECK-FIXES: std::unique_ptr<int> P3 = absl::make_unique<int>();
+
+ P3.reset(new int);
+ // CHECK-MESSAGES: :[[@LINE-1]]:6: warning: use absl::make_unique instead [abseil-make-unique]
+ // CHECK-FIXES: P3 = absl::make_unique<int>();
+
+ // Nested parentheses
+ std::unique_ptr<int> P4 = std::unique_ptr<int>((new int(3)));
+ // CHECK-MESSAGES: :[[@LINE-1]]:29: warning: use absl::make_unique instead [abseil-make-unique]
+ // CHECK-FIXES: std::unique_ptr<int> P4 = absl::make_unique<int>(3);
+
+ P4 = std::unique_ptr<int>(((new int(4))));
+ // CHECK-MESSAGES: :[[@LINE-1]]:8: warning: use absl::make_unique instead [abseil-make-unique]
+ // CHECK-FIXES: P4 = absl::make_unique<int>(4);
+
+ P4.reset((new int(5)));
+ // CHECK-MESSAGES: :[[@LINE-1]]:6: warning: use absl::make_unique instead [abseil-make-unique]
+ // CHECK-FIXES: P4 = absl::make_unique<int>(5);
+
+ // With auto
+ auto P5 = std::unique_ptr<int>(new int());
+ // CHECK-MESSAGES: :[[@LINE-1]]:13: warning: use absl::make_unique instead [abseil-make-unique]
+ // CHECK-FIXES: auto P5 = absl::make_unique<int>();
+
+ {
+ // No std
+ using namespace std;
+ unique_ptr<int> Q = unique_ptr<int>(new int());
+ // CHECK-MESSAGES: :[[@LINE-1]]:25: warning: use absl::make_unique instead [abseil-make-unique]
+ // CHECK-FIXES: unique_ptr<int> Q = absl::make_unique<int>();
+
+ Q = unique_ptr<int>(new int());
+ // CHECK-MESSAGES: :[[@LINE-1]]:9: warning: use absl::make_unique instead [abseil-make-unique]
+ // CHECK-FIXES: Q = absl::make_unique<int>();
+ }
+
+ // Create the unique_ptr as a parameter to a function
+ expectPointer(std::unique_ptr<int>(new int()));
+ // CHECK-MESSAGES: :[[@LINE-1]]:17: warning: use absl::make_unique instead [abseil-make-unique]
+ // CHECK-FIXES: expectPointer(absl::make_unique<int>());
+}
+
+void Negatives() {
+ // Only warn if explicitly allocating a new object
+ std::unique_ptr<int> R = std::unique_ptr<int>(returnPointer());
+ R.reset(returnPointer());
+
+ // Only replace if the template type is same as new type
+ auto Pderived = std::unique_ptr<Base>(new Derived());
+}
Index: docs/clang-tidy/checks/modernize-make-unique.rst
===================================================================
--- docs/clang-tidy/checks/modernize-make-unique.rst
+++ docs/clang-tidy/checks/modernize-make-unique.rst
@@ -48,3 +48,9 @@
If set to non-zero, the check will not give warnings inside macros. Default
is `1`.
+
+.. option:: IgnoreListInit
+
+ If set to non-zero, the check will ignore list initializations of `new`
+ expressions. Default is `0`.
+
Index: docs/clang-tidy/checks/list.rst
===================================================================
--- docs/clang-tidy/checks/list.rst
+++ docs/clang-tidy/checks/list.rst
@@ -13,6 +13,7 @@
abseil-duration-subtraction
abseil-duration-unnecessary-conversion
abseil-faster-strsplit-delimiter
+ abseil-make-unique (redirects to modernize-make-unique) <modernize-make-unique>
abseil-no-internal-dependencies
abseil-no-namespace
abseil-redundant-strcat-calls
Index: docs/clang-tidy/checks/abseil-make-unique.rst
===================================================================
--- /dev/null
+++ docs/clang-tidy/checks/abseil-make-unique.rst
@@ -0,0 +1,9 @@
+.. title:: clang-tidy - abseil-make-unique
+.. meta::
+ :http-equiv=refresh: 5;URL=abseil-make-unique.html
+
+abseil-make-unique
+==================
+
+The abseil-make-unique check is an alias, please see
+`modernize-make-unique <modernize-make-unique.html>`_ for more information.
Index: docs/ReleaseNotes.rst
===================================================================
--- docs/ReleaseNotes.rst
+++ docs/ReleaseNotes.rst
@@ -85,6 +85,11 @@
Finds and fixes cases where ``absl::Duration`` values are being converted to
numeric types and back again.
+- New alias :doc:`abseil-make-unique
+ <clang-tidy/checks/abseil-make-unique>` to :doc:`modernize-make-unique
+ <clang-tidy/checks/modernize-make-unique>`
+ added.
+
- New :doc:`abseil-time-subtraction
<clang-tidy/checks/abseil-time-subtraction>` check.
@@ -104,6 +109,11 @@
`CommentUserDefiniedLiterals`, `CommentStringLiterals`,
`CommentCharacterLiterals` & `CommentNullPtrs` options.
+- The :doc:`modernize-make-unique
+ <clang-tidy/checks/modernize-make-unique>` now supports an
+ `IgnoreListInit` option which disables the check when the constructor
+ is a list initialization.
+
- The `Acronyms` and `IncludeDefaultAcronyms` options for the
:doc:`objc-property-declaration <clang-tidy/checks/objc-property-declaration>`
check have been removed.
Index: clang-tidy/modernize/MakeSmartPtrCheck.h
===================================================================
--- clang-tidy/modernize/MakeSmartPtrCheck.h
+++ clang-tidy/modernize/MakeSmartPtrCheck.h
@@ -50,6 +50,7 @@
const std::string MakeSmartPtrFunctionHeader;
const std::string MakeSmartPtrFunctionName;
const bool IgnoreMacros;
+ const bool IgnoreListInit;
void checkConstruct(SourceManager &SM, ASTContext *Ctx,
const CXXConstructExpr *Construct, const QualType *Type,
Index: clang-tidy/modernize/MakeSmartPtrCheck.cpp
===================================================================
--- clang-tidy/modernize/MakeSmartPtrCheck.cpp
+++ clang-tidy/modernize/MakeSmartPtrCheck.cpp
@@ -39,6 +39,20 @@
} // namespace
+namespace {
+
+AST_MATCHER_P(CXXNewExpr, hasInitializationStyle,
+ CXXNewExpr::InitializationStyle, IS) {
+ return Node.getInitializationStyle() == IS;
+};
+
+AST_POLYMORPHIC_MATCHER_P(boolean, AST_POLYMORPHIC_SUPPORTED_TYPES(Stmt, Decl),
+ bool, Boolean) {
+ return Boolean;
+}
+
+} // namespace
+
const char MakeSmartPtrCheck::PointerType[] = "pointerType";
MakeSmartPtrCheck::MakeSmartPtrCheck(StringRef Name,
@@ -51,13 +65,15 @@
Options.get("MakeSmartPtrFunctionHeader", StdMemoryHeader)),
MakeSmartPtrFunctionName(
Options.get("MakeSmartPtrFunction", MakeSmartPtrFunctionName)),
- IgnoreMacros(Options.getLocalOrGlobal("IgnoreMacros", true)) {}
+ IgnoreMacros(Options.getLocalOrGlobal("IgnoreMacros", true)),
+ IgnoreListInit(Options.get("IgnoreListInit", false)) {}
void MakeSmartPtrCheck::storeOptions(ClangTidyOptions::OptionMap &Opts) {
Options.store(Opts, "IncludeStyle", IncludeStyle);
Options.store(Opts, "MakeSmartPtrFunctionHeader", MakeSmartPtrFunctionHeader);
Options.store(Opts, "MakeSmartPtrFunction", MakeSmartPtrFunctionName);
Options.store(Opts, "IgnoreMacros", IgnoreMacros);
+ Options.store(Opts, "IgnoreListInit", IgnoreListInit);
}
bool MakeSmartPtrCheck::isLanguageVersionSupported(
@@ -89,7 +105,10 @@
hasArgument(0,
cxxNewExpr(hasType(pointsTo(qualType(hasCanonicalType(
equalsBoundNode(PointerType))))),
- CanCallCtor)
+ CanCallCtor,
+ anyOf(unless(boolean(IgnoreListInit)),
+ unless(hasInitializationStyle(
+ CXXNewExpr::ListInit))))
.bind(NewExpression)),
unless(isInTemplateInstantiation()))
.bind(ConstructorCall)))),
@@ -99,7 +118,11 @@
cxxMemberCallExpr(
thisPointerType(getSmartPointerTypeMatcher()),
callee(cxxMethodDecl(hasName("reset"))),
- hasArgument(0, cxxNewExpr(CanCallCtor).bind(NewExpression)),
+ hasArgument(
+ 0, cxxNewExpr(CanCallCtor, anyOf(unless(boolean(IgnoreListInit)),
+ unless(hasInitializationStyle(
+ CXXNewExpr::ListInit))))
+ .bind(NewExpression)),
unless(isInTemplateInstantiation()))
.bind(ResetCall),
this);
@@ -342,7 +365,7 @@
Diag << FixItHint::CreateRemoval(
SourceRange(NewStart, InitRange.getBegin()));
Diag << FixItHint::CreateRemoval(SourceRange(InitRange.getEnd(), NewEnd));
- }
+ }
else {
// New array expression with default/value initialization:
// smart_ptr<Foo[]>(new int[5]());
Index: clang-tidy/abseil/AbseilTidyModule.cpp
===================================================================
--- clang-tidy/abseil/AbseilTidyModule.cpp
+++ clang-tidy/abseil/AbseilTidyModule.cpp
@@ -9,6 +9,7 @@
#include "../ClangTidy.h"
#include "../ClangTidyModule.h"
#include "../ClangTidyModuleRegistry.h"
+#include "../modernize/MakeUniqueCheck.h"
#include "DurationAdditionCheck.h"
#include "DurationComparisonCheck.h"
#include "DurationConversionCastCheck.h"
@@ -64,6 +65,17 @@
"abseil-time-subtraction");
CheckFactories.registerCheck<UpgradeDurationConversionsCheck>(
"abseil-upgrade-duration-conversions");
+ CheckFactories.registerCheck<modernize::MakeUniqueCheck>(
+ "abseil-make-unique");
+ }
+
+ ClangTidyOptions getModuleOptions() override {
+ ClangTidyOptions Options;
+ ClangTidyOptions::OptionMap &Opts = Options.CheckOptions;
+ Opts["abseil-make-unique.MakeSmartPtrFunctionHeader"] = "absl/memory/memory.h";
+ Opts["abseil-make-unique.MakeSmartPtrFunction"] = "absl::make_unique";
+ Opts["abseil-make-unique.IgnoreListInit"] = true;
+ return Options;
}
};
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
