Fix #11981 internalAstError with using declaration

danmar · Sep 13, 2023 · 4487578 · 4487578
1 parent 523c41a
commit 4487578
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -3236,9 +3236,18 @@ bool Tokenizer::simplifyUsing()
                         }
                     }
 
-                    // just replace simple type aliases
-                    TokenList::copyTokens(tok1, start, usingEnd->previous());
-                    tok1->deleteThis();
+                    // Is this a "T()" expression where T is a pointer type?
+                    if (Token::Match(tok1, "%name% ( )") && !pointers.empty()) {
+                        auto tok2 = tok1->linkAt(1);
+                        tok1->deleteThis();
+                        TokenList::copyTokens(tok1, start, usingEnd->previous());
+                        tok2->insertToken("0");
+                        after = tok2->next();
+                    }
+                    else { // just replace simple type aliases
+                        TokenList::copyTokens(tok1, start, usingEnd->previous());
+                        tok1->deleteThis();
+                    }
                     substitute = true;
                 }
             } else {

diff --git a/test/testsimplifyusing.cpp b/test/testsimplifyusing.cpp
@@ -71,6 +71,7 @@ class TestSimplifyUsing : public TestFixture {
         TEST_CASE(simplifyUsing26); // #11090
         TEST_CASE(simplifyUsing27);
         TEST_CASE(simplifyUsing28);
+        TEST_CASE(simplifyUsing29);
 
         TEST_CASE(simplifyUsing8970);
         TEST_CASE(simplifyUsing8971);
@@ -684,6 +685,14 @@ class TestSimplifyUsing : public TestFixture {
         ASSERT_EQUALS("", errout.str());
     }
 
+    void simplifyUsing29() { // #11981
+        const char code[] = "using T = int*;\n"
+                            "void f(T = T()) {}\n";
+        const char expected[] = "void f ( int * = ( int * ) 0 ) { }";
+        ASSERT_EQUALS(expected, tok(code, cppcheck::Platform::Type::Native, /*debugwarnings*/ true));
+        ASSERT_EQUALS("", errout.str());
+    }
+
     void simplifyUsing8970() {
         const char code[] = "using V = std::vector<int>;\n"
                             "struct A {\n"