remove some platform specific behavior

Z3Prover · Dec 24, 2024 · 23c4728 · 23c4728
1 parent 5541918
commit 23c4728
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 8 deletions.
diff --git a/src/ast/rewriter/bool_rewriter.cpp b/src/ast/rewriter/bool_rewriter.cpp
@@ -272,7 +272,7 @@ br_status bool_rewriter::mk_nflat_or_core(unsigned num_args, expr * const * args
         if (s) {
             if (m_sort_disjunctions) {
                 ast_lt lt;
-                std::sort(buffer.begin(), buffer.end(), lt);
+                std::stable_sort(buffer.begin(), buffer.end(), lt);
             }
             result = m().mk_or(sz, buffer.data());
             return BR_DONE;
@@ -311,7 +311,7 @@ br_status bool_rewriter::mk_flat_or_core(unsigned num_args, expr * const * args,
         if (mk_nflat_or_core(flat_args.size(), flat_args.data(), result) == BR_FAILED) {
             if (m_sort_disjunctions && !ordered) {
                 ast_lt lt;
-                std::sort(flat_args.begin(), flat_args.end(), lt);
+                std::stable_sort(flat_args.begin(), flat_args.end(), lt);
             }
             result = mk_or_app(flat_args.size(), flat_args.data());
         }

diff --git a/src/ast/rewriter/th_rewriter.cpp b/src/ast/rewriter/th_rewriter.cpp
@@ -598,9 +598,9 @@ struct th_rewriter_cfg : public default_rewriter_cfg {
         }
         app_ref tmp(m());
         tmp = m().mk_app(f, num, args);
-        m().trace_stream() << "[inst-discovered] theory-solving " << static_cast<void *>(nullptr) << " " << m().get_family_name(fid) << "# ; #" << tmp->get_id() << "\n";
+        m().trace_stream() << "[inst-discovered] theory-solving 0x0 " << m().get_family_name(fid) << "# ; #" << tmp->get_id() << "\n";
         tmp = m().mk_eq(tmp, result);
-        m().trace_stream() << "[instance] " << static_cast<void *>(nullptr) << " #" << tmp->get_id() << "\n";
+        m().trace_stream() << "[instance] 0x0 #" << tmp->get_id() << "\n";
 
         // Make sure that both the result term and equality were newly introduced.
         if (tmp->get_ref_count() == 1) {

diff --git a/src/smt/qi_queue.cpp b/src/smt/qi_queue.cpp
@@ -188,8 +188,7 @@ namespace smt {
 
     void qi_queue::display_instance_profile(fingerprint * f, quantifier * q, unsigned num_bindings, enode * const * bindings, unsigned proof_id, unsigned generation) {
         if (m.has_trace_stream()) {
-            m.trace_stream() << "[instance] ";
-            m.trace_stream() << static_cast<void*>(f);
+            m.trace_stream() << "[instance] 0x0";
             if (m.proofs_enabled())
                 m.trace_stream() << " #" << proof_id;
             m.trace_stream() << " ; " << generation;

diff --git a/src/smt/smt_quantifier.cpp b/src/smt/smt_quantifier.cpp
@@ -240,7 +240,7 @@ namespace smt {
              vector<std::tuple<enode *, enode *>> & used_enodes) {
 
             if (pat == nullptr) {
-                trace_stream() << "[inst-discovered] MBQI " << " #" << q->get_id();
+                trace_stream() << "[inst-discovered] MBQI 0x0 #" << q->get_id();
                 for (unsigned i = 0; i < num_bindings; ++i) {
                     trace_stream() << " #" << bindings[num_bindings - i - 1]->get_owner_id();
                 }

diff --git a/src/smt/smt_theory.cpp b/src/smt/smt_theory.cpp
@@ -211,7 +211,7 @@ namespace smt {
         symbol const & family_name = m.get_family_name(get_family_id());
 
         if (pattern_id == UINT_MAX) {
-            out << "[inst-discovered] theory-solving " << " " << family_name << "#";
+            out << "[inst-discovered] theory-solving 0x0 " << family_name << "#";
             if (axiom_id != UINT_MAX)
                 out << axiom_id;
             for (unsigned i = 0; i < num_bindings; ++i) {