[PATCH] D41852: [clang-tidy] Don't generate fix for argument constructed from std::initializer_list.

[Haojian Wu via Phabricator via cfe-commits]

hokein created this revision.
hokein added reviewers: ilya-biryukov, alexfh.
Herald added subscribers: xazax.hun, klimek.

A follow-up fix of https://reviews.llvm.org/rL311652.

The previous `vector` in our test is different with `std::vector`, so
The check still generates fixes for std::vector (`auto p =
std::unique_ptr<Foo>(new Foo({1,2,3}))`) in real world, the patch makes the
vector behavior in test align with std::vector (both AST nodes are the same now).


Repository:
  rCTE Clang Tools Extra

https://reviews.llvm.org/D41852

Files:
  clang-tidy/modernize/MakeSmartPtrCheck.cpp
  test/clang-tidy/Inputs/modernize-smart-ptr/initializer_list.h
  test/clang-tidy/modernize-make-unique.cpp


Index: test/clang-tidy/modernize-make-unique.cpp
===================================================================
--- test/clang-tidy/modernize-make-unique.cpp
+++ test/clang-tidy/modernize-make-unique.cpp
@@ -25,6 +25,11 @@
   int a, b;
 };
 
+template<typename T>
+struct MyVector {
+  MyVector(std::initializer_list<T>);
+};
+
 struct Empty {};
 
 struct E {
@@ -45,6 +50,7 @@
 
 struct H {
   H(std::vector<int>);
+  H(MyVector<int>, int);
 };
 
 struct I {
@@ -331,6 +337,13 @@
   // CHECK-MESSAGES: :[[@LINE-1]]:7: warning: use std::make_unique instead
   // CHECK-FIXES: PH1.reset(new H({1, 2, 3}));
 
+  std::unique_ptr<H> PH2 = std::unique_ptr<H>(new H({1, 2, 3}, 1));
+  // CHECK-MESSAGES: :[[@LINE-1]]:28: warning: use std::make_unique instead
+  // CHECK-FIXES: std::unique_ptr<H> PH2 = std::unique_ptr<H>(new H({1, 2, 3}, 1));
+  PH2.reset(new H({1, 2, 3}, 1));
+  // CHECK-MESSAGES: :[[@LINE-1]]:7: warning: use std::make_unique instead
+  // CHECK-FIXES: PH2.reset(new H({1, 2, 3}, 1));
+
   std::unique_ptr<I> PI1 = std::unique_ptr<I>(new I(G({1, 2, 3})));
   // CHECK-MESSAGES: :[[@LINE-1]]:28: warning: use std::make_unique instead
   // CHECK-FIXES: std::unique_ptr<I> PI1 = std::make_unique<I>(G({1, 2, 3}));
Index: test/clang-tidy/Inputs/modernize-smart-ptr/initializer_list.h
===================================================================
--- test/clang-tidy/Inputs/modernize-smart-ptr/initializer_list.h
+++ test/clang-tidy/Inputs/modernize-smart-ptr/initializer_list.h
@@ -27,5 +27,6 @@
 class vector {
  public:
   vector(initializer_list<_E> init);
+  ~vector();
 };
 } // namespace std
Index: clang-tidy/modernize/MakeSmartPtrCheck.cpp
===================================================================
--- clang-tidy/modernize/MakeSmartPtrCheck.cpp
+++ clang-tidy/modernize/MakeSmartPtrCheck.cpp
@@ -281,12 +281,25 @@
         if (isa<CXXStdInitializerListExpr>(Arg)) {
           return false;
         }
+        // Check whether we construct a class from a std::initializer_list.
+        // If so, we won't generate the fixes.
+        auto IsStdInitListInitConstructExpr = [](const Expr* E) {
+          assert(E);
+          if (const auto *ImplicitCE = dyn_cast<CXXConstructExpr>(E)) {
+            if (ImplicitCE->isStdInitListInitialization())
+              return true;
+          }
+          return false;
+        };
         // Check the implicit conversion from the std::initializer_list type to
         // a class type.
-        if (const auto *ImplicitCE = dyn_cast<CXXConstructExpr>(Arg)) {
-          if (ImplicitCE->isStdInitListInitialization()) {
+        if (IsStdInitListInitConstructExpr(Arg))
+          return false;
+        // The Arg can be a CXXBindTemporaryExpr, checking its underlying
+        // construct expr.
+        if (const auto * CTE = dyn_cast<CXXBindTemporaryExpr>(Arg)) {
+          if (IsStdInitListInitConstructExpr(CTE->getSubExpr()))
             return false;
-          }
         }
       }
     }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D41852.129043.patch
Type: text/x-patch
Size: 2990 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20180109/1b4cef87/attachment.bin>