checkLibraryCheckType: handle global scope operator

danmar · Jun 26, 2023 · b4e0cfb · b4e0cfb
1 parent 9dc38f8
commit b4e0cfb
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/lib/checkunusedvar.cpp b/lib/checkunusedvar.cpp
@@ -1268,7 +1268,9 @@ void CheckUnusedVar::checkFunctionVariableUsage()
                     op1Var->isClass() &&
                     (!op1Var->valueType() || op1Var->valueType()->type == ValueType::Type::UNKNOWN_TYPE)) {
                     // Check in the library if we should bailout or not..
-                    const std::string typeName = op1Var->getTypeName();
+                    std::string typeName = op1Var->getTypeName();
+                    if (typeName.find("::") == 0)
+                        typeName.erase(typeName.begin(), typeName.begin() + 2);
                     switch (mSettings->library.getTypeCheck("unusedvar", typeName)) {
                     case Library::TypeCheck::def:
                         bailoutTypeName = typeName;

diff --git a/test/testunusedvar.cpp b/test/testunusedvar.cpp
@@ -6171,6 +6171,15 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("void f(std::span<int> s) {\n" // #11545
                               "    s[0] = 0;\n"
                               "}\n");
+        ASSERT_EQUALS("", errout.str());        
+
+        functionVariableUsage("struct S {\n"
+                              "    std::mutex m;\n"
+                              "    void f();\n"
+                              "};\n"
+                              "void S::f() {\n"
+                              "    const ::std::lock_guard g(m);\n"
+                              "}\n");
         ASSERT_EQUALS("", errout.str());
     }