Respect [[maybe_unused]] in unusedPrivateFunction (danmar#4579)

chrchr-github · web-flow · commit 4e75c08f5884 · 2022-11-10T20:58:39.000+01:00
diff --git a/lib/checkclass.cpp b/lib/checkclass.cpp
@@ -1273,19 +1273,24 @@ void CheckClass::privateFunctions()
         }
 
         while (!privateFuncs.empty()) {
+            const auto& pf = privateFuncs.front();
+            if (pf->retDef && pf->retDef->isAttributeMaybeUnused()) {
+                privateFuncs.pop_front();
+                continue;
+            }
             // Check that all private functions are used
-            bool used = checkFunctionUsage(privateFuncs.front(), scope); // Usage in this class
+            bool used = checkFunctionUsage(pf, scope); // Usage in this class
             // Check in friend classes
             const std::vector<Type::FriendInfo>& friendList = scope->definedType->friendList;
             for (int i = 0; i < friendList.size() && !used; i++) {
                 if (friendList[i].type)
-                    used = checkFunctionUsage(privateFuncs.front(), friendList[i].type->classScope);
+                    used = checkFunctionUsage(pf, friendList[i].type->classScope);
                 else
                     used = true; // Assume, it is used if we do not see friend class
             }
 
             if (!used)
-                unusedPrivateFunctionError(privateFuncs.front()->tokenDef, scope->className, privateFuncs.front()->name());
+                unusedPrivateFunctionError(pf->tokenDef, scope->className, pf->name());
 
             privateFuncs.pop_front();
         }
diff --git a/test/testunusedprivfunc.cpp b/test/testunusedprivfunc.cpp
@@ -88,6 +88,7 @@ class TestUnusedPrivateFunction : public TestFixture {
         TEST_CASE(staticVariable); //ticket #5566
 
         TEST_CASE(templateSimplification); //ticket #6183
+        TEST_CASE(maybeUnused);
     }
 
 
@@ -874,6 +875,13 @@ class TestUnusedPrivateFunction : public TestFixture {
               "}");
         ASSERT_EQUALS("", errout.str());
     }
+
+    void maybeUnused() {
+        check("class C {\n"
+              "    [[maybe_unused]] int f() { return 42; }\n"
+              "};");
+        ASSERT_EQUALS("", errout.str());
+    }
 };
 
 REGISTER_TEST(TestUnusedPrivateFunction)
