Check all scopes

chrchr-github · Jul 16, 2023 · 90b8b79 · 90b8b79
1 parent ba9f8a5
commit 90b8b79
Showing 1 changed file with 15 additions and 7 deletions.
diff --git a/lib/valueflow.cpp b/lib/valueflow.cpp
@@ -5625,14 +5625,22 @@ static void valueFlowForwardConst(Token* start,
 
         for (Token* tok = start; tok != end; tok = tok->next()) {
             if (tok->varId() == var->declarationId()) {
-                if (tok->scope()->type == Scope::ScopeType::eIf) {
-                    MathLib::bigint result{};
-                    bool error{};
-                    execute(tok->scope()->bodyStart->linkAt(-1), pm, &result, &error, settings);
-                    if (!result || error)
-                        continue;
+                const Scope* scope = tok->scope();
+                bool setValue = true;
+                while (scope && scope->isLocal()) {
+                    if (scope->type == Scope::ScopeType::eIf) {
+                        MathLib::bigint result{};
+                        bool error{};
+                        execute(tok->scope()->bodyStart->linkAt(-1)->astOperand2(), pm, &result, &error, settings);
+                        if (!result && !error) {
+                            setValue = false;
+                            break;
+                        }
+                    }
+                    scope = scope->nestedIn;
                 }
-                setTokenValue(tok, value, settings);
+                if (setValue)
+                    setTokenValue(tok, value, settings);
             } else {
                 [&] {
                     // Follow references