mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-15 13:28:47 +00:00
Code Activity

Fix is_int64 bug in mpz when compiling with GMP

Browse source 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
This commit is contained in:
Leonardo de Moura 2013-04-08 14:50:17 -07:00
parent 03c1b24dea
commit 3d34aa7f01
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/test/rational.cpp
View file

@ -171,7 +171,7 @@ static void tst2() {
rational int64_max("9223372036854775807"); rational int64_max("9223372036854775807");
rational int64_min(-int64_max - rational(1)); rational int64_min((-int64_max) - rational(1));
// is_int64 // is_int64
SASSERT(int64_max.is_int64()); SASSERT(int64_max.is_int64());
SASSERT(int64_min.is_int64()); SASSERT(int64_min.is_int64());

5
src/util/mpz.cpp
View file

@ -128,6 +128,8 @@ mpz_manager<SYNCH>::mpz_manager():
mpz_mul(m_int64_max, m_tmp, m_int64_max); mpz_mul(m_int64_max, m_tmp, m_int64_max);
mpz_set_ui(m_tmp, max_l); mpz_set_ui(m_tmp, max_l);
mpz_add(m_int64_max, m_tmp, m_int64_max); mpz_add(m_int64_max, m_tmp, m_int64_max);
mpz_neg(m_int64_min, m_int64_max);
mpz_sub_ui(m_int64_min, m_int64_min, 1);
#endif #endif
mpz one(1); mpz one(1);
@ -152,6 +154,7 @@ mpz_manager<SYNCH>::~mpz_manager() {
deallocate(m_arg[1]); deallocate(m_arg[1]);
mpz_clear(m_uint64_max); mpz_clear(m_uint64_max);
mpz_clear(m_int64_max); mpz_clear(m_int64_max);
mpz_clear(m_int64_min);
#endif #endif
if (SYNCH) if (SYNCH)
omp_destroy_nest_lock(&m_lock); omp_destroy_nest_lock(&m_lock);
@ -1317,7 +1320,7 @@ bool mpz_manager<SYNCH>::is_int64(mpz const & a) const {
} }
#else #else
// GMP version // GMP version
return mpz_cmp(*a.m_ptr, m_int64_max) <= 0; return mpz_cmp(m_int64_min, *a.m_ptr) <= 0 && mpz_cmp(*a.m_ptr, m_int64_max) <= 0;
#endif #endif
} }

1
src/util/mpz.h
View file

@ -168,6 +168,7 @@ class mpz_manager {
mpz_t * m_arg[2]; mpz_t * m_arg[2];
mpz_t m_uint64_max; mpz_t m_uint64_max;
mpz_t m_int64_max; mpz_t m_int64_max;
mpz_t m_int64_min;
mpz_t * allocate() { mpz_t * allocate() {
mpz_t * cell = reinterpret_cast<mpz_t*>(m_allocator.allocate(sizeof(mpz_t))); mpz_t * cell = reinterpret_cast<mpz_t*>(m_allocator.allocate(sizeof(mpz_t)));