Index: clang-tools-extra/trunk/clang-tidy/modernize/UseEmplaceCheck.cpp =================================================================== --- clang-tools-extra/trunk/clang-tidy/modernize/UseEmplaceCheck.cpp +++ clang-tools-extra/trunk/clang-tidy/modernize/UseEmplaceCheck.cpp @@ -20,6 +20,12 @@ return Node.hasExplicitTemplateArgs(); } +namespace impl { +// FIXME: This matcher should be replaced by a matcher from ASTMatcher.h +const ast_matchers::internal::VariadicDynCastAllOfMatcher cxxStdInitializerListExpr; +} // namespace impl + const auto DefaultContainersWithPushBack = "::std::vector; ::std::list; ::std::deque"; const auto DefaultSmartPointers = @@ -74,7 +80,11 @@ // emplace_back can't access private constructor. auto IsPrivateCtor = hasDeclaration(cxxConstructorDecl(isPrivate())); - auto HasInitList = has(ignoringImplicit(initListExpr())); + auto HasInitList = anyOf(has(ignoringImplicit(initListExpr())), + has(impl::cxxStdInitializerListExpr())); + // FIXME: Replace internal C++ initializer list matcher with one from + // ASTMatchers.h + // FIXME: Discard 0/NULL (as nullptr), static inline const data members, // overloaded functions and template names. auto SoughtConstructExpr = Index: clang-tools-extra/trunk/test/clang-tidy/modernize-use-emplace.cpp =================================================================== --- clang-tools-extra/trunk/test/clang-tidy/modernize-use-emplace.cpp +++ clang-tools-extra/trunk/test/clang-tidy/modernize-use-emplace.cpp @@ -4,9 +4,19 @@ // RUN: value: '::std::vector; ::std::list; ::std::deque; llvm::LikeASmallVector'}]}" -- -std=c++11 namespace std { +template +class initializer_list +{ +public: + initializer_list() noexcept {} +}; + template class vector { public: + vector() = default; + vector(initializer_list) {} + void push_back(const T &) {} void push_back(T &&) {} @@ -455,3 +465,16 @@ // CHECK-MESSAGES: :[[@LINE-1]]:5: warning: use emplace_back // CHECK-FIXES: v.emplace_back(42); } + +void testInitializerList() { + std::vector> v; + v.push_back(std::vector({1})); + // Test against the bug reported in PR32896. + + v.push_back({{2}}); + + using PairIntVector = std::pair>; + std::vector x; + x.push_back(PairIntVector(3, {4})); + x.push_back({5, {6}}); +}