Pack bool fields into bitfields in sat::drat and static_features

src/ast/static_features.h

@@ -75,16 +75,6 @@ struct static_features {
     unsigned                 m_num_uninterpreted_constants; //
     unsigned                 m_num_uninterpreted_functions; //
     unsigned                 m_num_eqs;         //
-    bool                     m_has_rational;    //
-    bool                     m_has_int;         //
-    bool                     m_has_real;        //
-    bool                     m_has_bv;          //
-    bool                     m_has_fpa;         //
-    bool                     m_has_sr;          // has special relations
-    bool                     m_has_str;         // has String-typed terms
-    bool                     m_has_seq_non_str; // has non-String-typed Sequence terms
-    bool                     m_has_arrays;      //
-    bool                     m_has_ext_arrays;  // does this use extended array theory.
     rational                 m_arith_k_sum;     // sum of the numerals in arith atoms.
     unsigned                 m_num_arith_terms;
     unsigned                 m_num_arith_eqs;   // equalities of the form t = k where k is a numeral
@@ -98,6 +88,16 @@ struct static_features {
     unsigned_vector          m_num_apps;             // mapping decl_id   -> num_apps;
     unsigned_vector          m_num_theory_terms;     // mapping family_id -> num_terms
     unsigned_vector          m_num_theory_atoms;     // mapping family_id -> num_atoms
+    unsigned                 m_has_rational:1;    //
+    unsigned                 m_has_int:1;         //
+    unsigned                 m_has_real:1;        //
+    unsigned                 m_has_bv:1;          //
+    unsigned                 m_has_fpa:1;         //
+    unsigned                 m_has_sr:1;          // has special relations
+    unsigned                 m_has_str:1;         // has String-typed terms
+    unsigned                 m_has_seq_non_str:1; // has non-String-typed Sequence terms
+    unsigned                 m_has_arrays:1;      //
+    unsigned                 m_has_ext_arrays:1;  // does this use extended array theory.
     unsigned_vector          m_num_theory_constants; // mapping family_id -> num_exprs
     unsigned_vector          m_num_theory_eqs;       // mapping family_id -> num_eqs
     unsigned                 m_num_aliens;            //

src/sat/sat_drat.h

@@ -57,12 +57,12 @@ namespace sat {
         svector<std::pair<literal, clause*>> m_units;
         vector<watch>           m_watches;
         svector<lbool>          m_assignment;
-        bool                    m_inconsistent = false;
-        bool                    m_check_unsat = false;
-        bool                    m_check_sat = false;
-        bool                    m_check = false;
-        bool                    m_activity = false;
         stats                   m_stats;
+        unsigned                m_inconsistent:1 = 0;
+        unsigned                m_check_unsat:1 = 0;
+        unsigned                m_check_sat:1 = 0;
+        unsigned                m_check:1 = 0;
+        unsigned                m_activity:1 = 0;
 
 
         void dump_activity();

src/smt/smt_justification.cpp

@@ -323,8 +323,7 @@ namespace smt {
         std::uninitialized_copy(eqs, eqs + num_eqs, m_eqs);
         DEBUG_CODE(
             for (unsigned i = 0; i < num_eqs; ++i) {
-                enode_pair const & [n1, n2] = eqs[i];
-                SASSERT(n1->get_root() == n2->get_root());
+                SASSERT(eqs[i].first->get_root() == eqs[i].second->get_root());
             }
         );
     }