programmemory.cpp: avoid unnecessary copy of settings in evaluateLibraryFunction (danmar#6642)

firewave · web-flow · commit 18949d9faa06 · 2024-07-26T11:28:52.000+02:00
diff --git a/lib/programmemory.cpp b/lib/programmemory.cpp
@@ -1820,15 +1820,15 @@ ValueFlow::Value evaluateLibraryFunction(const std::unordered_map<nonneg int, Va
                                          bool cpp)
 {
     thread_local static std::unordered_map<std::string,
-                                           std::function<ValueFlow::Value(const std::unordered_map<nonneg int, ValueFlow::Value>& arg)>>
+                                           std::function<ValueFlow::Value(const std::unordered_map<nonneg int, ValueFlow::Value>&, const Settings&)>>
     functions = {};
     if (functions.count(returnValue) == 0) {
 
         std::unordered_map<nonneg int, const Token*> lookupVarId;
         std::shared_ptr<Token> expr = createTokenFromExpression(returnValue, settings, cpp, lookupVarId);
 
         functions[returnValue] =
-            [lookupVarId, expr, settings](const std::unordered_map<nonneg int, ValueFlow::Value>& xargs) {
+            [lookupVarId, expr](const std::unordered_map<nonneg int, ValueFlow::Value>& xargs, const Settings& settings) {
             if (!expr)
                 return ValueFlow::Value::unknown();
             ProgramMemory pm{};
@@ -1840,7 +1840,7 @@ ValueFlow::Value evaluateLibraryFunction(const std::unordered_map<nonneg int, Va
             return execute(expr.get(), pm, settings);
         };
     }
-    return functions.at(returnValue)(args);
+    return functions.at(returnValue)(args, settings);
 }
 
 void execute(const Token* expr,
