Fix #12340 FP knownConditionTrueFalse with typeid (danmar#5877)

Author: chrchr-github

lib/astutils.cpp

@@ -1497,6 +1497,20 @@ bool isUsedAsBool(const Token* const tok, const Settings* settings)
     return false;
 }
 
+bool compareTokenFlags(const Token* tok1, const Token* tok2, bool macro) {
+    if (macro && (tok1->isExpandedMacro() || tok2->isExpandedMacro() || tok1->isTemplateArg() || tok2->isTemplateArg()))
+        return false;
+    if (tok1->isComplex() != tok2->isComplex())
+        return false;
+    if (tok1->isLong() != tok2->isLong())
+        return false;
+    if (tok1->isUnsigned() != tok2->isUnsigned())
+        return false;
+    if (tok1->isSigned() != tok2->isSigned())
+        return false;
+    return true;
+};
+
 static bool astIsBoolLike(const Token* tok)
 {
     return astIsBool(tok) || isUsedAsBool(tok);
@@ -1613,20 +1627,8 @@ bool isSameExpression(bool cpp, bool macro, const Token *tok1, const Token *tok2
         }
         return false;
     }
-    auto flagsDiffer = [](const Token* tok1, const Token* tok2, bool macro) {
-        if (macro && (tok1->isExpandedMacro() || tok2->isExpandedMacro() || tok1->isTemplateArg() || tok2->isTemplateArg()))
-            return true;
-        if (tok1->isComplex() != tok2->isComplex())
-            return true;
-        if (tok1->isLong() != tok2->isLong())
-            return true;
-        if (tok1->isUnsigned() != tok2->isUnsigned())
-            return true;
-        if (tok1->isSigned() != tok2->isSigned())
-            return true;
-        return false;
-    };
-    if (flagsDiffer(tok1, tok2, macro))
+
+    if (!compareTokenFlags(tok1, tok2, macro))
         return false;
 
     if (pure && tok1->isName() && tok1->next()->str() == "(" && tok1->str() != "sizeof" && !(tok1->variable() && tok1 == tok1->variable()->nameToken())) {
@@ -1671,7 +1673,7 @@ bool isSameExpression(bool cpp, bool macro, const Token *tok1, const Token *tok2
         const Token *end1 = t1->link();
         const Token *end2 = t2->link();
         while (t1 && t2 && t1 != end1 && t2 != end2) {
-            if (t1->str() != t2->str() || flagsDiffer(t1, t2, macro))
+            if (t1->str() != t2->str() || !compareTokenFlags(t1, t2, macro))
                 return false;
             t1 = t1->next();
             t2 = t2->next();
@@ -1692,7 +1694,7 @@ bool isSameExpression(bool cpp, bool macro, const Token *tok1, const Token *tok2
         const Token *t2 = tok2->next();
         while (t1 && t2 &&
                t1->str() == t2->str() &&
-               !flagsDiffer(t1, t2, macro) &&
+               compareTokenFlags(t1, t2, macro) &&
                (t1->isName() || t1->str() == "*")) {
             t1 = t1->next();
             t2 = t2->next();

lib/astutils.h

@@ -274,6 +274,11 @@ const Token* isInLoopCondition(const Token* tok);
  */
 CPPCHECKLIB bool isUsedAsBool(const Token* const tok, const Settings* settings = nullptr);
 
+/**
+ * Are the tokens' flags equal?
+ */
+bool compareTokenFlags(const Token* tok1, const Token* tok2, bool macro);
+
 /**
  * Are two conditions opposite
  * @param isNot  do you want to know if cond1 is !cond2 or if cond1 and cond2 are non-overlapping. true: cond1==!cond2  false: cond1==true => cond2==false

lib/symboldatabase.cpp

@@ -1724,7 +1724,7 @@ void SymbolDatabase::createSymbolDatabaseExprIds()
 
         // Assign IDs
         ExprIdMap exprIdMap;
-        std::map<std::string, nonneg int> baseIds;
+        std::map<std::string, std::pair<nonneg int, const Token*>> baseIds;
         for (auto* tok = const_cast<Token*>(scope->bodyStart); tok != scope->bodyEnd; tok = tok->next()) {
             if (tok->varId() > 0) {
                 tok->exprId(tok->varId());
@@ -1743,10 +1743,10 @@ void SymbolDatabase::createSymbolDatabaseExprIds()
                     ++id;
                 } else {
                     const auto it = baseIds.find(tok->str());
-                    if (it != baseIds.end()) {
-                        tok->exprId(it->second);
+                    if (it != baseIds.end() && compareTokenFlags(tok, it->second.second, /*macro*/ true)) {
+                        tok->exprId(it->second.first);
                     } else {
-                        baseIds[tok->str()] = id;
+                        baseIds[tok->str()] = { id, tok };
                         tok->exprId(id);
                         ++id;
                     }

test/testvarid.cpp

@@ -243,6 +243,7 @@ class TestVarID : public TestFixture {
         TEST_CASE(exprid6);
         TEST_CASE(exprid7);
         TEST_CASE(exprid8);
+        TEST_CASE(exprid9);
 
         TEST_CASE(structuredBindings);
     }
@@ -3994,6 +3995,19 @@ class TestVarID : public TestFixture {
         ASSERT_EQUALS(expected4, tokenizeExpr(code4));
     }
 
+    void exprid9()
+    {
+        const char code[] = "void f(const std::type_info& type) {\n" // #12340
+                            "    if (type == typeid(unsigned int)) {}\n"
+                            "    else if (type == typeid(int)) {}\n"
+                            "}\n";
+        const char expected[] = "1: void f ( const std :: type_info & type ) {\n"
+                                "2: if ( type@1 ==@UNIQUE typeid (@UNIQUE unsigned int@UNIQUE ) ) { }\n"
+                                "3: else { if ( type@1 ==@UNIQUE typeid (@UNIQUE int@UNIQUE ) ) { } }\n"
+                                "4: }\n";
+        ASSERT_EQUALS(expected, tokenizeExpr(code));
+    }
+
     void structuredBindings() {
         const char code[] = "int foo() { auto [x,y] = xy(); return x+y; }";
         ASSERT_EQUALS("1: int foo ( ) { auto [ x@1 , y@2 ] = xy ( ) ; return x@1 + y@2 ; }\n",