[clang-tidy] Made abseil-faster-strsplit-delimiter tests pass on C++17

[hokein]

looks good.

clang-tools-extra/trunk/clang-tidy/abseil/FasterStrsplitDelimiterCheck.cpp

 namespace clang {
 namespace tidy {
 namespace abseil {
 
 namespace {
 
 AST_MATCHER(StringLiteral, lengthIsOne) { return Node.getLength() == 1; }
 
-::internal::Matcher<Expr>
-constructExprWithArg(llvm::StringRef ClassName,
-                     const ::internal::Matcher<Expr> &Arg) {
-  auto ConstrExpr = cxxConstructExpr(hasType(recordDecl(hasName(ClassName))),
-                                     hasArgument(0, ignoringParenCasts(Arg)));
-
-  return anyOf(ConstrExpr, cxxBindTemporaryExpr(has(ConstrExpr)));
-}
-
-::internal::Matcher<Expr>
-copyConstructExprWithArg(llvm::StringRef ClassName,
-                         const ::internal::Matcher<Expr> &Arg) {
-  return constructExprWithArg(ClassName, constructExprWithArg(ClassName, Arg));
-}
-
 llvm::Optional<std::string> makeCharacterLiteral(const StringLiteral *Literal) {
   std::string Result;
   {
     llvm::raw_string_ostream Stream(Result);
     Literal->outputString(Stream);
   }
 
   // Special case: If the string contains a single quote, we just need to return
if (!getLangOpts().CPlusPlus)
     return;
 
   // Binds to one character string literals.
   const auto SingleChar =
       expr(ignoringParenCasts(stringLiteral(lengthIsOne()).bind("Literal")));
 
   // Binds to a string_view (either absl or std) that was passed by value and
   // contructed from string literal.
-  auto StringViewArg =
-      copyConstructExprWithArg("::absl::string_view", SingleChar);
+  auto StringViewArg = ignoringElidableConstructorCall(ignoringImpCasts(
+      cxxConstructExpr(hasType(recordDecl(hasName("::absl::string_view"))),
+                       hasArgument(0, ignoringParenImpCasts(SingleChar)))));
 
+  // Need to ignore the elidable constructor as otherwise there is no match for
+  // c++14 and earlier.
   auto ByAnyCharArg =
-      expr(copyConstructExprWithArg("::absl::ByAnyChar", StringViewArg))
+      expr(has(ignoringElidableConstructorCall(
+               ignoringParenCasts(cxxBindTemporaryExpr(has(cxxConstructExpr(
+                   hasType(recordDecl(hasName("::absl::ByAnyChar"))),
+                   hasArgument(0, StringViewArg))))))))
           .bind("ByAnyChar");
 
   // Find uses of absl::StrSplit(..., "x") and absl::StrSplit(...,
   // absl::ByAnyChar("x")) to transform them into absl::StrSplit(..., 'x').
   Finder->addMatcher(callExpr(callee(functionDecl(hasName("::absl::StrSplit"))),
                               hasArgument(1, anyOf(ByAnyCharArg, SingleChar)),
                               unless(isInTemplateInstantiation()))
                          .bind("StrSplit"),

clang-tools-extra/trunk/test/clang-tidy/abseil-faster-strsplit-delimiter.cpp

-// RUN: %check_clang_tidy -std=c++11,c++14 %s abseil-faster-strsplit-delimiter %t
+// RUN: %check_clang_tidy -std=c++11-or-later %s abseil-faster-strsplit-delimiter %t
 // FIXME: Fix the checker to work in C++17 mode.
 
 namespace absl {
 
 class string_view {
   public:
     string_view();
     string_view(const char *);