Follow-up to #13478: Fix FP, remove redundant statement (danmar#7138)

Author: chrchr-github

lib/checkother.cpp

@@ -907,11 +907,9 @@ void CheckOther::checkUnreachableCode()
                 tok->str() == "break") {
                 while (Token::simpleMatch(secondBreak, "{") && secondBreak->scope()->type == Scope::ScopeType::eUnconditional)
                     secondBreak = secondBreak->next();
-                if (Token::Match(secondBreak, "%name% :"))
-                    continue;
             }
-            if (Token::simpleMatch(secondBreak, "; }"))
-                continue;
+            while (Token::simpleMatch(secondBreak, ";"))
+                secondBreak = secondBreak->next();
 
             // Statements follow directly, no line between them. (#3383)
             // TODO: Try to find a better way to avoid false positives due to preprocessor configurations.

test/testother.cpp

@@ -5624,6 +5624,31 @@ class TestOther : public TestFixture {
               "    std::cout << \"y\";\n"
               "}\n");
         ASSERT_EQUALS("[test.cpp:6]: (style) Statements following noreturn function 'exit()' will never be executed.\n", errout_str());
+
+        check("int f() {\n" // #13475
+              "    { return 0; };\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("int f(int i) {\n" // #13478
+              "    int x = 0;\n"
+              "    switch (i) {\n"
+              "        { case 0: x = 5; break; }\n"
+              "        { case 1: x = 7; break; }\n"
+              "    }\n"
+              "    return x;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("int f(int c) {\n"
+              "    switch (c) {\n"
+              "    case '\\n':\n"
+              "    { return 1; };\n"
+              "    default:\n"
+              "    { return c; };\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void redundantContinue() {