From 3fca59ac849e4fbf85e4ed93dfd7e52144c65885 Mon Sep 17 00:00:00 2001
From: Nikolaj Bjorner <nbjorner@microsoft.com>
Date: Sat, 21 Dec 2019 18:06:28 -0800
Subject: [PATCH] add missing scoped_push

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
---
 src/math/dd/dd_bdd.cpp | 9 ++++++---
 src/math/dd/dd_bdd.h   | 7 +++++++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/math/dd/dd_bdd.cpp b/src/math/dd/dd_bdd.cpp
index a9a43dd18..6036ae10c 100644
--- a/src/math/dd/dd_bdd.cpp
+++ b/src/math/dd/dd_bdd.cpp
@@ -83,13 +83,14 @@ namespace dd {
     bdd_manager::BDD bdd_manager::apply(BDD arg1, BDD arg2, bdd_op op) {
         bool first = true;
         SASSERT(well_formed());
+        scoped_push _sp(*this);
         while (true) {
             try {
                 return apply_rec(arg1, arg2, op);
             }
             catch (const mem_out &) {
-                try_reorder();
                 if (!first) throw;
+                try_reorder();
                 first = false;
             }
         }
@@ -542,13 +543,14 @@ namespace dd {
 
     bdd bdd_manager::mk_not(bdd b) {
         bool first = true;
+        scoped_push _sp(*this);
         while (true) {
             try {
                 return bdd(mk_not_rec(b.root), this);
             }
             catch (const mem_out &) {
-                try_reorder();
                 if (!first) throw;
+                try_reorder();
                 first = false;
             }
         }
@@ -571,13 +573,14 @@ namespace dd {
     
     bdd bdd_manager::mk_ite(bdd const& c, bdd const& t, bdd const& e) {         
         bool first = true;
+        scoped_push _sp(*this);
         while (true) {
             try {
                 return bdd(mk_ite_rec(c.root, t.root, e.root), this); 
             }
             catch (const mem_out &) {
-                try_reorder();
                 if (!first) throw;
+                try_reorder();
                 first = false;
             }
         }
diff --git a/src/math/dd/dd_bdd.h b/src/math/dd/dd_bdd.h
index 9ad69255b..55cb20486 100644
--- a/src/math/dd/dd_bdd.h
+++ b/src/math/dd/dd_bdd.h
@@ -193,6 +193,13 @@ namespace dd {
         void reserve_var(unsigned v);
         bool well_formed();
 
+        struct scoped_push {
+            bdd_manager& m;
+            unsigned     m_size;
+            scoped_push(bdd_manager& m) :m(m), m_size(m.m_bdd_stack.size()) {}
+            ~scoped_push() { m.m_bdd_stack.shrink(m_size); }
+        };
+
     public:
         struct mem_out {};