Usa an actual depth

danmar · Nov 25, 2023 · 815d013 · 815d013
1 parent a0ff7d8
commit 815d013
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/lib/forwardanalyzer.cpp b/lib/forwardanalyzer.cpp
@@ -40,14 +40,6 @@
 #include <vector>
 
 namespace {
-    struct OnExit {
-        std::function<void()> f;
-
-        ~OnExit() {
-            f();
-        }
-    };
-
     struct ForwardTraversal {
         enum class Progress { Continue, Break, Skip };
         enum class Terminate { None, Bail, Inconclusive };

diff --git a/lib/programmemory.cpp b/lib/programmemory.cpp
@@ -1263,7 +1263,7 @@ namespace {
         const Settings* settings = nullptr;
         int fdepth = 4;
         ValueFlow::Value unknown = ValueFlow::Value::unknown();
-        int depth = 100;
+        int depth = 10;
 
         explicit Executor(ProgramMemory* pm = nullptr, const Settings* settings = nullptr) : pm(pm), settings(settings) {}
 
@@ -1614,6 +1614,7 @@ namespace {
         ValueFlow::Value execute(const Token* expr)
         {
             depth--;
+            OnExit onExit{[&] { depth++; }};
             if (depth < 0)
                 return unknown;
             ValueFlow::Value v = executeImpl(expr);

diff --git a/lib/utils.h b/lib/utils.h
@@ -48,6 +48,14 @@ struct SelectMapValues {
     }
 };
 
+struct OnExit {
+    std::function<void()> f;
+
+    ~OnExit() {
+        f();
+    }
+};
+
 template<class Range, class T>
 bool contains(const Range& r, const T& x)
 {