Fix #11899 FP unusedScopedObject for function call and imported constructor (danmar#6620)

chrchr-github · web-flow · commit 450ea7cf0163 · 2024-07-21T11:21:20.000+02:00
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -571,6 +571,8 @@ void Tokenizer::simplifyUsingToTypedef()
             while (Token::Match(endtok, ":: %name%"))
                 endtok = endtok->tokAt(2);
             if (endtok && endtok->str() == ";") {
+                if (endtok->strAt(-1) == endtok->strAt(-3))
+                    continue;
                 tok->next()->str("typedef");
                 endtok = endtok->previous();
                 endtok->insertToken(endtok->str());
diff --git a/test/testsimplifyusing.cpp b/test/testsimplifyusing.cpp
@@ -70,6 +70,7 @@ class TestSimplifyUsing : public TestFixture {
         TEST_CASE(simplifyUsing28);
         TEST_CASE(simplifyUsing29);
         TEST_CASE(simplifyUsing30);
+        TEST_CASE(simplifyUsing31);
 
         TEST_CASE(simplifyUsing8970);
         TEST_CASE(simplifyUsing8971);
@@ -754,6 +755,33 @@ class TestSimplifyUsing : public TestFixture {
         }
     }
 
+    void simplifyUsing31() { // #11899
+        const char code[] = "struct B {\n"
+                            "    B();\n"
+                            "    void f();\n"
+                            "};\n"
+                            "struct D : B {\n"
+                            "    using B::B;\n"
+                            "    void g() {\n"
+                            "        B::f();\n"
+                            "    }\n"
+                            "    B b;\n"
+                            "};\n";
+        const char expected[] = "struct B { "
+                                "B ( ) ; "
+                                "void f ( ) ; "
+                                "} ; "
+                                "struct D : B { "
+                                "using B = B :: B ; "
+                                "void g ( ) { "
+                                "B :: f ( ) ; "
+                                "} "
+                                "B b ; "
+                                "} ;";
+        ASSERT_EQUALS(expected, tok(code, Platform::Type::Native, /*debugwarnings*/ true));
+        ASSERT_EQUALS("", errout_str());
+    }
+
     void simplifyUsing8970() {
         const char code[] = "using V = std::vector<int>;\n"
                             "struct A {\n"
