[Libreoffice-commits] core.git: compilerplugins/clang

[Stephan Bergmann]

 compilerplugins/clang/stringconstant.cxx |   23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

New commits:
commit c0f241e80f95f196ef2aa031156cb38daf7e5241
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Sat Feb 11 20:31:37 2017 +0100

    SourceManager::getFilename returns StringRef
    
    Change-Id: I77db8565efe2e0d366afc8470308d7801a2a7337

diff --git a/compilerplugins/clang/stringconstant.cxx b/compilerplugins/clang/stringconstant.cxx
index d7f34f9..8616096 100644
--- a/compilerplugins/clang/stringconstant.cxx
+++ b/compilerplugins/clang/stringconstant.cxx
@@ -318,10 +318,8 @@ bool StringConstant::VisitCallExpr(CallExpr const * expr) {
     {
         // u.equalsIgnoreAsciiCaseAscii("foo") ->
         // u.equalsIngoreAsciiCase("foo"):
-        std::string file(
-            compiler.getSourceManager().getFilename(
-                compiler.getSourceManager().getSpellingLoc(
-                    expr->getLocStart())));
+        auto file = compiler.getSourceManager().getFilename(
+            compiler.getSourceManager().getSpellingLoc(expr->getLocStart()));
         if (file == SRCDIR "/sal/qa/rtl/strings/test_oustring_compare.cxx") {
             return true;
         }
@@ -336,10 +334,8 @@ bool StringConstant::VisitCallExpr(CallExpr const * expr) {
     {
         // u.equalsIgnoreAsciiCaseAsciiL("foo", 3) ->
         // u.equalsIngoreAsciiCase("foo"):
-        std::string file(
-            compiler.getSourceManager().getFilename(
-                compiler.getSourceManager().getSpellingLoc(
-                    expr->getLocStart())));
+        auto file = compiler.getSourceManager().getFilename(
+            compiler.getSourceManager().getSpellingLoc(expr->getLocStart()));
         if (file == SRCDIR "/sal/qa/rtl/strings/test_oustring_compare.cxx") {
             return true;
         }
@@ -703,10 +699,9 @@ bool StringConstant::VisitCallExpr(CallExpr const * expr) {
         case 2:
             {
                 // b.append("foo", 3) -> b.append("foo"):
-                std::string file(
-                    compiler.getSourceManager().getFilename(
-                        compiler.getSourceManager().getSpellingLoc(
-                            expr->getLocStart())));
+                auto file = compiler.getSourceManager().getFilename(
+                    compiler.getSourceManager().getSpellingLoc(
+                        expr->getLocStart()));
                 if (file
                     == SRCDIR "/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx")
                 {
@@ -990,11 +985,11 @@ bool StringConstant::VisitCXXConstructExpr(CXXConstructExpr const * expr) {
                                 if (dc.Operator(OO_Plus).Namespace("rtl")
                                     .GlobalNamespace())
                                 {
-                                    std::string file(
+                                    auto file =
                                         compiler.getSourceManager().getFilename(
                                             compiler.getSourceManager()
                                             .getSpellingLoc(
-                                                expr->getLocStart())));
+                                                expr->getLocStart()));
                                     if (file
                                         == (SRCDIR
                                             "/sal/qa/rtl/strings/test_ostring_concat.cxx")