replaced global emptyString used for const reference results with local instances (danmar#7250)

Author: firewave

lib/library.cpp

@@ -143,6 +143,8 @@ struct Library::LibraryData
     std::unordered_set<std::string> mEntrypoints;
 };
 
+const std::string Library::mEmptyString;
+
 Library::Library()
     : mData(new LibraryData())
 {}
@@ -1588,9 +1590,9 @@ Library::UseRetValType Library::getUseRetValType(const Token *ftok) const
 const std::string& Library::returnValue(const Token *ftok) const
 {
     if (isNotLibraryFunction(ftok))
-        return emptyString;
+        return mEmptyString;
     const auto it = utils::as_const(mData->mReturnValue).find(getFunctionName(ftok));
-    return it != mData->mReturnValue.cend() ? it->second : emptyString;
+    return it != mData->mReturnValue.cend() ? it->second : mEmptyString;
 }
 
 const std::string& Library::returnValueType(const Token *ftok) const
@@ -1601,10 +1603,10 @@ const std::string& Library::returnValueType(const Token *ftok) const
             if (contTok->valueType() && contTok->valueType()->container)
                 return contTok->valueType()->container->getReturnType(ftok->str());
         }
-        return emptyString;
+        return mEmptyString;
     }
     const auto it = utils::as_const(mData->mReturnValueType).find(getFunctionName(ftok));
-    return it != mData->mReturnValueType.cend() ? it->second : emptyString;
+    return it != mData->mReturnValueType.cend() ? it->second : mEmptyString;
 }
 
 int Library::returnValueContainer(const Token *ftok) const
@@ -1794,7 +1796,7 @@ const std::string& Library::blockstart(const std::string &file) const
     if (map_it != mData->mExecutableBlocks.end()) {
         return map_it->second.start();
     }
-    return emptyString;
+    return mEmptyString;
 }
 
 const std::string& Library::blockend(const std::string &file) const
@@ -1805,7 +1807,7 @@ const std::string& Library::blockend(const std::string &file) const
     if (map_it != mData->mExecutableBlocks.end()) {
         return map_it->second.end();
     }
-    return emptyString;
+    return mEmptyString;
 }
 
 bool Library::iskeyword(const std::string &file, const std::string &keyword) const

lib/library.h

@@ -52,6 +52,8 @@ namespace tinyxml2 {
 class CPPCHECKLIB Library {
     friend struct LibraryHelper; // for testing
 
+    static const std::string mEmptyString;
+
 public:
     Library();
     ~Library();
@@ -252,7 +254,7 @@ class CPPCHECKLIB Library {
 
         const std::string& getReturnType(const std::string& function) const {
             const auto i = utils::as_const(functions).find(function);
-            return (i != functions.end()) ? i->second.returnType : emptyString;
+            return (i != functions.end()) ? i->second.returnType : mEmptyString;
         }
 
         static Yield yieldFrom(const std::string& yieldName);
@@ -348,7 +350,7 @@ class CPPCHECKLIB Library {
 
     const std::string& validarg(const Token *ftok, int argnr) const {
         const ArgumentChecks *arg = getarg(ftok, argnr);
-        return arg ? arg->valid : emptyString;
+        return arg ? arg->valid : mEmptyString;
     }
 
     const ArgumentChecks::IteratorInfo *getArgIteratorInfo(const Token *ftok, int argnr) const {

lib/symboldatabase.h

@@ -125,7 +125,8 @@ class CPPCHECKLIB Type {
     std::string name() const;
 
     const std::string& type() const {
-        return classDef ? classDef->str() : emptyString;
+        static const std::string s_empty_string;
+        return classDef ? classDef->str() : s_empty_string;
     }
 
     bool isClassType() const;
@@ -294,7 +295,8 @@ class CPPCHECKLIB Variable {
         if (mNameToken)
             return mNameToken->str();
 
-        return emptyString;
+        static const std::string s_empty_string;
+        return s_empty_string;
     }
 
     /**

lib/token.cpp

@@ -56,6 +56,7 @@ namespace {
 }
 
 const std::list<ValueFlow::Value> TokenImpl::mEmptyValueList;
+const std::string Token::mEmptyString;
 
 Token::Token(TokensFrontBack &tokensFrontBack)
     : mTokensFrontBack(tokensFrontBack)

lib/token.h

@@ -167,6 +167,8 @@ class CPPCHECKLIB Token {
 private:
     TokensFrontBack& mTokensFrontBack;
 
+    static const std::string mEmptyString;
+
 public:
     Token(const Token &) = delete;
     Token& operator=(const Token &) = delete;
@@ -256,7 +258,7 @@ class CPPCHECKLIB Token {
     const std::string &strAt(int index) const
     {
         const Token *tok = this->tokAt(index);
-        return tok ? tok->mStr : emptyString;
+        return tok ? tok->mStr : mEmptyString;
     }
 
     /**
@@ -1272,7 +1274,7 @@ class CPPCHECKLIB Token {
      * @return the original name.
      */
     const std::string & originalName() const {
-        return mImpl->mOriginalName ? *mImpl->mOriginalName : emptyString;
+        return mImpl->mOriginalName ? *mImpl->mOriginalName : mEmptyString;
     }
 
     const std::list<ValueFlow::Value>& values() const {

lib/tokenlist.cpp

@@ -77,7 +77,8 @@ TokenList::~TokenList()
 const std::string& TokenList::getSourceFilePath() const
 {
     if (getFiles().empty()) {
-        return emptyString;
+        static const std::string s_empty_string;
+        return s_empty_string;
     }
     return getFiles()[0];
 }

lib/vf_analyzers.cpp

@@ -435,7 +435,8 @@ struct ValueFlowAnalyzer : Analyzer {
             {"^=", "^="}};
         auto it = lookup.find(assign);
         if (it == lookup.end()) {
-            return emptyString;
+            static const std::string s_empty_string;
+            return s_empty_string;
         }
         return it->second;
     }