Fix matcher for constructors via an implicit cast

Fix matcher for constructors via an implicit cast so it matches implicit constructor call where the function accepts a reference.

Change-Id: I2e94d7d05536012a24a42fd30e28c7535f1f2ccc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2545851Reviewed-by: Łukasz Anforowicz <lukasza@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Commit-Queue: Keishi Hattori <keishi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#828886}

tools/clang/rewrite_raw_ptr_fields/RewriteRawPtrFields.cpp

@@ -1101,10 +1101,12 @@ int main(int argc, const char* argv[]) {
   // binds the |s.y| expr if it matches the |affected_expr_matcher| above.
   //
   // See also testcases in tests/affected-expr-original.cc
-  auto implicit_ctor_expr_matcher = implicitCastExpr(has(cxxConstructExpr(allOf(
+  auto implicit_ctor_expr_matcher = cxxConstructExpr(allOf(
+      anyOf(hasParent(materializeTemporaryExpr()),
+            hasParent(implicitCastExpr())),
       hasDeclaration(
           cxxConstructorDecl(allOf(parameterCountIs(1), unless(isExplicit())))),
-      forEachArgumentWithParam(affected_expr_matcher, parmVarDecl())))));
+      forEachArgumentWithParam(affected_expr_matcher, parmVarDecl())));
   match_finder.addMatcher(implicit_ctor_expr_matcher, &affected_expr_rewriter);
 
   // |auto| type declarations =========

tools/clang/rewrite_raw_ptr_fields/tests/affected-expr-expected.cc

@@ -289,6 +289,7 @@ class BasicStringPiece {
 };
 // Test case:
 void FunctionTakingBasicStringPiece(StringPiece arg) {}
+void FunctionTakingBasicStringPieceRef(const StringPiece& arg) {}
 
 class ClassWithImplicitConstructor {
  public:
@@ -307,6 +308,11 @@ void foo() {
   // 'BasicStringPiece<basic_string<char, char_traits<char>, allocator<char>>>')
   // for 1st argument
   FunctionTakingBasicStringPiece(my_struct.const_char_ptr.get());
+  FunctionTakingBasicStringPieceRef(my_struct.const_char_ptr.get());
+
+  // No rewrite expected.
+  FunctionTakingBasicStringPiece(StringPiece(my_struct.const_char_ptr));
+  FunctionTakingBasicStringPieceRef(StringPiece(my_struct.const_char_ptr));
 
   // Expected rewrite - appending: .get().  This is the same scenario as with
   // StringPiece above (except that no templates are present here).

tools/clang/rewrite_raw_ptr_fields/tests/affected-expr-original.cc

@@ -287,6 +287,7 @@ class BasicStringPiece {
 };
 // Test case:
 void FunctionTakingBasicStringPiece(StringPiece arg) {}
+void FunctionTakingBasicStringPieceRef(const StringPiece& arg) {}
 
 class ClassWithImplicitConstructor {
  public:
@@ -305,6 +306,11 @@ void foo() {
   // 'BasicStringPiece<basic_string<char, char_traits<char>, allocator<char>>>')
   // for 1st argument
   FunctionTakingBasicStringPiece(my_struct.const_char_ptr);
+  FunctionTakingBasicStringPieceRef(my_struct.const_char_ptr);
+
+  // No rewrite expected.
+  FunctionTakingBasicStringPiece(StringPiece(my_struct.const_char_ptr));
+  FunctionTakingBasicStringPieceRef(StringPiece(my_struct.const_char_ptr));
 
   // Expected rewrite - appending: .get().  This is the same scenario as with
   // StringPiece above (except that no templates are present here).