mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-15 02:16:16 +00:00
Code Activity

#5849

Browse source
This commit is contained in:
Nikolaj Bjorner 2022-02-20 09:52:42 -08:00
parent 1e463955c2
commit 5c2624950b
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/tactic/bv/bit_blaster_model_converter.cpp
View file

@ -21,6 +21,7 @@ Notes:
#include "tactic/model_converter.h" #include "tactic/model_converter.h"
#include "ast/bv_decl_plugin.h" #include "ast/bv_decl_plugin.h"
#include "ast/ast_smt2_pp.h" #include "ast/ast_smt2_pp.h"
#include "ast/ast_pp.h"
#include "ast/ast_util.h" #include "ast/ast_util.h"
/** /**
@ -40,9 +41,7 @@ struct bit_blaster_model_converter : public model_converter {
obj_map<func_decl, expr*> const & const2bits, obj_map<func_decl, expr*> const & const2bits,
ptr_vector<func_decl> const& newbits): ptr_vector<func_decl> const& newbits):
m_vars(m), m_bits(m), m_newbits(m) { m_vars(m), m_bits(m), m_newbits(m) {
for (auto const& kv : const2bits) { for (auto const& [v, bits] : const2bits) {
func_decl * v = kv.m_key;
expr * bits = kv.m_value;
SASSERT(!TO_BOOL || is_app_of(bits, m.get_family_id("bv"), OP_MKBV)); SASSERT(!TO_BOOL || is_app_of(bits, m.get_family_id("bv"), OP_MKBV));
SASSERT(TO_BOOL || is_app_of(bits, m.get_family_id("bv"), OP_CONCAT)); SASSERT(TO_BOOL || is_app_of(bits, m.get_family_id("bv"), OP_CONCAT));
m_vars.push_back(v); m_vars.push_back(v);

4
src/tactic/bv/bv1_blaster_tactic.cpp
View file

@ -37,7 +37,7 @@ class bv1_blaster_tactic : public tactic {
bv_util m_util; bv_util m_util;
obj_map<func_decl, expr*> m_const2bits; obj_map<func_decl, expr*> m_const2bits;
ptr_vector<func_decl> m_newbits; ptr_vector<func_decl> m_newbits;
expr_ref_vector m_saved; ast_ref_vector m_saved;
expr_ref m_bit1; expr_ref m_bit1;
expr_ref m_bit0; expr_ref m_bit0;
@ -108,9 +108,11 @@ class bv1_blaster_tactic : public tactic {
for (unsigned i = 0; i < bv_size; i++) { for (unsigned i = 0; i < bv_size; i++) {
bits.push_back(m().mk_fresh_const(nullptr, b)); bits.push_back(m().mk_fresh_const(nullptr, b));
m_newbits.push_back(to_app(bits.back())->get_decl()); m_newbits.push_back(to_app(bits.back())->get_decl());
m_saved.push_back(m_newbits.back());
} }
r = butil().mk_concat(bits.size(), bits.data()); r = butil().mk_concat(bits.size(), bits.data());
m_saved.push_back(r); m_saved.push_back(r);
m_saved.push_back(f);
m_const2bits.insert(f, r); m_const2bits.insert(f, r);
result = r; result = r;
} }