Partial fix for #15048 Inconsistent error severity for invalidFunctionArg (#8962)

Author: chrchr-github

lib/checkfunctions.cpp

@@ -222,14 +222,15 @@ void CheckFunctionsImpl::invalidFunctionArgError(const Token *tok, const std::st
         errmsg << " The value is " << std::setprecision(10) << (invalidValue->isIntValue() ? invalidValue->intvalue : invalidValue->floatValue) << " but the valid values are '" << validstr << "'.";
     else
         errmsg << " The value is 0 or 1 (boolean) but the valid values are '" << validstr << "'.";
-    if (invalidValue)
+    if (invalidValue) {
+        const auto severity = invalidValue->errorSeverity() && invalidValue->isKnown() && !invalidValue->conditional ? Severity::error : Severity::warning;
         reportError(getErrorPath(tok, invalidValue, "Invalid argument"),
-                    invalidValue->errorSeverity() && invalidValue->isKnown() ? Severity::error : Severity::warning,
+                    severity,
                     "invalidFunctionArg",
                     errmsg.str(),
                     CWE628,
                     invalidValue->isInconclusive() ? Certainty::inconclusive : Certainty::normal);
-    else
+    } else
         reportError(tok,
                     Severity::error,
                     "invalidFunctionArg",

test/testfunctions.cpp

@@ -59,6 +59,7 @@ class TestFunctions : public TestFixture {
 
         // Invalid function argument
         TEST_CASE(invalidFunctionArg1);
+        TEST_CASE(invalidFunctionArgErrorPath);
 
         // Math function usage
         TEST_CASE(mathfunctionCall_fmod);
@@ -793,6 +794,22 @@ class TestFunctions : public TestFixture {
         ASSERT_EQUALS("", errout_str());
     }
 
+    void invalidFunctionArgErrorPath() {
+        setMultiline();
+        Settings s = settings;
+        s.templateLocation = "{file}:{line}:note:{info}\n";
+        check("double f(bool b) {\n"
+              "    double d = -1.0;\n"
+              "    if (b)\n"
+              "        return d;\n"
+              "    return std::log(d);\n"
+              "}\n", s);
+        ASSERT_EQUALS("[test.cpp:5:21]: warning: Invalid std::log() argument nr 1. The value is -1 but the valid values are '4.94066e-324:'. [invalidFunctionArg]\n"
+                      "[test.cpp:2:18]: note: Assignment 'd=-1.0', assigned value is -1.0\n"
+                      "[test.cpp:3:9]: note: Assuming condition is false\n"
+                      "[test.cpp:5:21]: note: Invalid argument\n", errout_str());
+    }
+
     void mathfunctionCall_sqrt() {
         // sqrt, sqrtf, sqrtl
         check("void foo()\n"