From 3de2feb84af3a7af66dfc17c66302170285e931c Mon Sep 17 00:00:00 2001
From: Nikolaj Bjorner <nbjorner@microsoft.com>
Date: Tue, 1 May 2018 09:46:54 -0700
Subject: [PATCH] fix build

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
---
 src/sat/sat_local_search.cpp    | 8 +++-----
 src/sat/sat_lookahead.cpp       | 7 +++----
 src/sat/sat_model_converter.cpp | 3 +--
 src/sat/sat_parallel.cpp        | 2 +-
 src/sat/sat_solver.cpp          | 2 +-
 5 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/sat/sat_local_search.cpp b/src/sat/sat_local_search.cpp
index e02560e5f..af2447fc2 100644
--- a/src/sat/sat_local_search.cpp
+++ b/src/sat/sat_local_search.cpp
@@ -377,9 +377,9 @@ namespace sat {
         verify_unsat_stack();
     }
 
-    local_search::local_search() : 
-        m_par(0),
-        m_is_unsat(false) {
+    local_search::local_search() :         
+        m_is_unsat(false),
+        m_par(nullptr) {
     }
 
     void local_search::import(solver& s, bool _init) {        
@@ -575,7 +575,6 @@ namespace sat {
 
     void local_search::gsat() {
         reinit();
-        bool reach_known_best_value = false;
         bool_var flipvar;
         timer timer;
         timer.start();
@@ -925,7 +924,6 @@ namespace sat {
         // update all flipvar's neighbor's conf_change to true, add goodvar/okvar
 
         var_info& vi = m_vars[flipvar];
-        unsigned sz = vi.m_neighbors.size();
         for (auto v : vi.m_neighbors) {
             m_vars[v].m_conf_change = true;
             if (score(v) > 0 && !already_in_goodvar_stack(v)) {
diff --git a/src/sat/sat_lookahead.cpp b/src/sat/sat_lookahead.cpp
index 122c628a0..3833e2a52 100644
--- a/src/sat/sat_lookahead.cpp
+++ b/src/sat/sat_lookahead.cpp
@@ -41,6 +41,7 @@ namespace sat {
     }
     lookahead::scoped_assumptions::~scoped_assumptions() {
         for (auto l : lits) {
+            (void)l;
             p.pop();
         }
     }
@@ -2070,7 +2071,7 @@ namespace sat {
         scoped_level _sl(*this, c_fixed_truth);
         m_search_mode = lookahead_mode::searching;
         unsigned depth = 0;
-        unsigned init_trail = m_trail.size();
+        // unsigned init_trail = m_trail.size();
         
         m_cube_state.reset_stats();
         if (!is_first) {
@@ -2184,8 +2185,6 @@ namespace sat {
     }
 
     std::ostream& lookahead::display_clauses(std::ostream& out) const {
-        bool first = true;
-
         for (unsigned idx = 0; idx < m_ternary.size(); ++idx) {
             literal lit = to_literal(idx);
             unsigned sz = m_ternary_count[idx];
@@ -2268,7 +2267,7 @@ namespace sat {
         init(learned);                
         if (inconsistent()) return;
         inc_istamp();            
-        literal l = choose();        
+        choose();        
         if (inconsistent()) return;
         SASSERT(m_trail_lim.empty());
         unsigned num_units = 0;
diff --git a/src/sat/sat_model_converter.cpp b/src/sat/sat_model_converter.cpp
index 22cab35ea..d132f1cd4 100644
--- a/src/sat/sat_model_converter.cpp
+++ b/src/sat/sat_model_converter.cpp
@@ -290,7 +290,7 @@ namespace sat {
                     for (literal l : it2->m_clauses) {
                         CTRACE("sat_model_converter", l.var() == it->var(), tout << "var: " << it->var() << "\n"; display(tout););
                         SASSERT(l.var() != it->var());
-                        SASSERT(l == null_literal || l.var() < num_vars);
+                        VERIFY(l == null_literal || l.var() < num_vars);
                         if (it2->var() == it->var()) return false;
                     }
                 }
@@ -391,7 +391,6 @@ namespace sat {
         sat::literal_vector clause;
         for (entry const& e : m_entries) {
             unsigned index = 0;
-            bool var_sign = false;
             clause.reset();
             for (literal l : e.m_clauses) {
                 if (l == null_literal) {
diff --git a/src/sat/sat_parallel.cpp b/src/sat/sat_parallel.cpp
index 8e50a1f91..c6e29f64c 100644
--- a/src/sat/sat_parallel.cpp
+++ b/src/sat/sat_parallel.cpp
@@ -91,7 +91,7 @@ namespace sat {
         return false;
     }
 
-    parallel::parallel(solver& s): m_scoped_rlimit(s.rlimit()), m_num_clauses(0), m_consumer_ready(false) {}
+    parallel::parallel(solver& s): m_num_clauses(0), m_consumer_ready(false), m_scoped_rlimit(s.rlimit()) {}
 
     parallel::~parallel() {
         for (unsigned i = 0; i < m_solvers.size(); ++i) {            
diff --git a/src/sat/sat_solver.cpp b/src/sat/sat_solver.cpp
index 5b6fb628a..825a1170a 100644
--- a/src/sat/sat_solver.cpp
+++ b/src/sat/sat_solver.cpp
@@ -791,7 +791,7 @@ namespace sat {
         }
         
         if (m_config.m_propagate_prefetch) {
-            _mm_prefetch((const char*)(m_watches[l.index()].c_ptr()), 1);
+            _mm_prefetch((const char*)(m_watches[l.index()].c_ptr()), _MM_HINT_T1);
         }
 
         SASSERT(!l.sign() || m_phase[v] == NEG_PHASE);