Merge branch 'chr_Fix8266' of https://github.com/chrchr-github/cppcheck into chr_Fix8266

Author: chrchr-github

lib/astutils.cpp

@@ -2174,17 +2174,28 @@ bool isVariableChanged(const Token *tok, int indirect, const Settings *settings,
         return !fun->isConst();
     }
 
-    const Token *ftok = tok2;
-    while (ftok && (!Token::Match(ftok, "[({]") || ftok->isCast()))
+    const Token* ftok = tok2, *ptok{};
+    while (ftok && (!Token::Match(ftok, "[({]") || ftok->isCast())) {
         ftok = ftok->astParent();
+        if (ftok && ftok->tokType() == Token::eLogicalOp)
+            ptok = ftok->astOperand1(); // check lhs
+    }
+
+    if ((ftok && Token::Match(ftok->link(), ")|} !!{")) || (ptok && Token::Match(ptok->link(), ")|} !!{"))) {
+        bool isChanged = false, inconclusive = false;
+        if (ptok) {
+            isChanged |= isVariableChangedByFunctionCall(ptok->next(), indirect, settings, &inconclusive); // lhs can be a function
+            isChanged |= inconclusive;
+        }
 
-    if (ftok && Token::Match(ftok->link(), ")|} !!{")) {
-        const Token * ptok = tok2;
-        while (Token::Match(ptok->astParent(), ".|::|["))
-            ptok = ptok->astParent();
-        bool inconclusive = false;
-        bool isChanged = isVariableChangedByFunctionCall(ptok, indirect, settings, &inconclusive);
-        isChanged |= inconclusive;
+        if (!isChanged) {
+            ptok = tok2;
+            while (Token::Match(ptok->astParent(), ".|::|["))
+                ptok = ptok->astParent();
+
+            isChanged = isVariableChangedByFunctionCall(ptok, indirect, settings, &inconclusive);
+            isChanged |= inconclusive;
+        }
         if (isChanged)
             return true;
     }

lib/checkcondition.cpp

@@ -693,7 +693,8 @@ void CheckCondition::multiCondition2()
                                 return ChildrenToVisit::op1_and_op2;
 
                             if ((!cond1->hasKnownIntValue() || !secondCondition->hasKnownIntValue()) &&
-                                isSameExpression(mTokenizer->isCPP(), true, cond1, secondCondition, mSettings->library, true, true, &errorPath)) {
+                                isSameExpression(mTokenizer->isCPP(), true, cond1, secondCondition, mSettings->library, true, true, &errorPath) &&
+                                !isExpressionChangedAt(cond1, secondCondition, 0, false, mSettings, mTokenizer->isCPP())) {
                                 if (!isAliased(vars) && !mTokenizer->hasIfdef(cond1, secondCondition)) {
                                     identicalConditionAfterEarlyExitError(cond1, secondCondition, errorPath);
                                     return ChildrenToVisit::done;

test/testother.cpp

@@ -9357,7 +9357,9 @@ class TestOther : public TestFixture {
               "    dostuff(x * 0);\n"
               "    dostuff(0 * x);\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Argument 'false&&x' to function dostuff is always 0. Constant literal calculation disable/hide variable expression 'x'.\n"
+        ASSERT_EQUALS("[test.cpp:2]: (style) Argument 'x&&false' to function dostuff is always 0. Constant literal calculation disable/hide variable expression 'x'.\n"
+                      "[test.cpp:3]: (style) Argument 'false&&x' to function dostuff is always 0. Constant literal calculation disable/hide variable expression 'x'.\n"
+                      "[test.cpp:4]: (style) Argument 'x||true' to function dostuff is always 1. Constant literal calculation disable/hide variable expression 'x'.\n"
                       "[test.cpp:5]: (style) Argument 'true||x' to function dostuff is always 1. Constant literal calculation disable/hide variable expression 'x'.\n"
                       "[test.cpp:6]: (style) Argument 'x*0' to function dostuff is always 0. Constant literal calculation disable/hide variable expression 'x'.\n"
                       "[test.cpp:7]: (style) Argument '0*x' to function dostuff is always 0. Constant literal calculation disable/hide variable expression 'x'.\n", errout.str());