Fix value_cleanup to handle cases where arg_expr is a macro.

tools/clang/value_cleanup/ListValueRewriter.cpp

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ListValueRewriter.h"
 
 #include <assert.h>
 #include <algorithm>
 
 #include "clang/AST/ASTContext.h"
@@ skipping 14 matching lines @@
 
 ListValueRewriter::AppendCallback::AppendCallback(Replacements* replacements)
     : replacements_(replacements) {}
 
 void ListValueRewriter::AppendCallback::run(
     const MatchFinder::MatchResult& result) {
   // Delete `new base::*Value(' and `)'.
   auto* newExpr = result.Nodes.getNodeAs<clang::CXXNewExpr>("newExpr");
   auto* argExpr = result.Nodes.getNodeAs<clang::Expr>("argExpr");
 
+  // Note that for the end loc, we use the expansion loc: the argument might be
+  // a macro like true and false.
   clang::CharSourceRange pre_arg_range = clang::CharSourceRange::getCharRange(
-      newExpr->getLocStart(), argExpr->getLocStart());
+      newExpr->getLocStart(),
+      result.SourceManager->getExpansionLoc(argExpr->getLocStart()));
   replacements_->emplace(*result.SourceManager, pre_arg_range, "");
 
   clang::CharSourceRange post_arg_range =
       clang::CharSourceRange::getTokenRange(newExpr->getLocEnd());
   replacements_->emplace(*result.SourceManager, post_arg_range, "");
 }
 
 ListValueRewriter::AppendBooleanCallback::AppendBooleanCallback(
     Replacements* replacements)
     : AppendCallback(replacements) {}
@@ skipping 135 matching lines @@
              hasArgument(
                  0, ignoringParenImpCasts(id(
                         "newExpr",
                         cxxNewExpr(has(cxxConstructExpr(
                             hasDeclaration(cxxMethodDecl(
                                 hasName("::base::StringValue::StringValue"))),
                             argumentCountIs(1),
                             hasArgument(0, id("argExpr", expr())))))))))),
       &append_string_callback_);
 }