February 2012 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Version number bumped.
by Roberto Bagnara 13 Feb '12

13 Feb '12

Module: ppl/ppl Branch: master Commit: 85c99baeae690a24a5a17eb5ee1279869e5e145d URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=85c99baeae69… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Feb 13 16:48:40 2012 +0100 Version number bumped. --- configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index 983f8c7..98d8248 100644 --- a/configure.ac +++ b/configure.ac @@ -24,7 +24,7 @@ # Process this file with Autoconf to produce a configure script. # Every other copy of the package version number gets its value from here. -AC_INIT([the Parma Polyhedra Library], [0.12pre5], [ppl-devel(a)cs.unipr.it], [ppl]) +AC_INIT([the Parma Polyhedra Library], [0.12pre6], [ppl-devel(a)cs.unipr.it], [ppl]) # Minimum Autoconf version required. AC_PREREQ(2.61)

1 0

[GIT] ppl/ppl(master): Indentation fixed.
by Roberto Bagnara 13 Feb '12

13 Feb '12

Module: ppl/ppl Branch: master Commit: cc8006165e6ffa0265e001311db62ec68118511e URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=cc8006165e6f… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Feb 13 16:48:11 2012 +0100 Indentation fixed. --- src/DB_Matrix.defs.hh | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/DB_Matrix.defs.hh b/src/DB_Matrix.defs.hh index 1582494..afe41ea 100644 --- a/src/DB_Matrix.defs.hh +++ b/src/DB_Matrix.defs.hh @@ -310,12 +310,12 @@ bool euclidean_distance_assign(Checked_Number<To, Extended_Number_Policy>& r, #endif // defined(PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS) template <typename Temp, typename To, typename T> bool l_infinity_distance_assign(Checked_Number<To, Extended_Number_Policy>& r, - const DB_Matrix<T>& x, - const DB_Matrix<T>& y, - Rounding_Dir dir, - Temp& tmp0, - Temp& tmp1, - Temp& tmp2); + const DB_Matrix<T>& x, + const DB_Matrix<T>& y, + Rounding_Dir dir, + Temp& tmp0, + Temp& tmp1, + Temp& tmp2); } // namespace Parma_Polyhedra_Library

1 0

[GIT] ppl/ppl(master): Enabled CC76_narrowing_assign for Boxes.
by Patricia Hill 13 Feb '12

13 Feb '12

Module: ppl/ppl Branch: master Commit: b459380ce0ca5721c8dad52e72b4cb4e407450a9 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b459380ce0ca… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Mon Feb 13 15:19:25 2012 +0000 Enabled CC76_narrowing_assign for Boxes. --- interfaces/ppl_interface_generator_common_dat.m4 | 4 +++- ...erface_generator_common_procedure_generators.m4 | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/interfaces/ppl_interface_generator_common_dat.m4 b/interfaces/ppl_interface_generator_common_dat.m4 index 8f37632..17b6a63 100644 --- a/interfaces/ppl_interface_generator_common_dat.m4 +++ b/interfaces/ppl_interface_generator_common_dat.m4 @@ -706,7 +706,9 @@ m4_define(`m4_extrapolation_replacements', `NONE') m4_define(`m4_BD_Shape_extrapolation_replacements', `CC76') m4_define(`m4_Octagonal_Shape_extrapolation_replacements', - `CC76') + `CC76') +m4_define(`m4_box_extrapolation_replacements', + `CC76') dnl --------------------------------------------------------------------- dnl pattern == widenexp diff --git a/interfaces/ppl_interface_generator_common_procedure_generators.m4 b/interfaces/ppl_interface_generator_common_procedure_generators.m4 index 7477af9..ead5e2c 100644 --- a/interfaces/ppl_interface_generator_common_procedure_generators.m4 +++ b/interfaces/ppl_interface_generator_common_procedure_generators.m4 @@ -111,7 +111,7 @@ ppl_@CLASS@_@LIMITEDBOUNDED@_@WIDENEXPN@_extrapolation_assign_with_tokens/5 +sim ppl_@CLASS@_@LIMITEDBOUNDED@_@WIDENEXPN@_extrapolation_assign/3 *nofail +simple, ppl_@CLASS@_@EXTRAPOLATION@_extrapolation_assign_with_tokens/4 +wr_shape, ppl_@CLASS@_@EXTRAPOLATION@_extrapolation_assign/2 *nofail +wr_shape, -ppl_@CLASS@_@EXTRAPOLATION@_narrowing_assign/2 +wr_shape, +ppl_@CLASS@_@EXTRAPOLATION@_narrowing_assign/2 +shape_group, dnl dnl NOTE: The next few schemas provide procedures specifically for dnl the pointset_powerset domains.

1 0

[GIT] ppl/ppl(master): Invoke libtool when checking with Valgrind enabled.
by Enea Zaffanella 13 Feb '12

13 Feb '12

Module: ppl/ppl Branch: master Commit: 690131aa5ec3e6c69c43c84ceca54ea893f2b0d4 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=690131aa5ec3… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Feb 13 15:48:24 2012 +0100 Invoke libtool when checking with Valgrind enabled. --- Watchdog/tests/Makefile.am | 1 + tests/Ask_Tell/Makefile.am | 1 + tests/BD_Shape/Makefile.am | 1 + tests/Box/Makefile.am | 1 + tests/CO_Tree/Makefile.am | 1 + tests/Concrete_Expression/Makefile.am | 1 + tests/Grid/Makefile.am | 1 + tests/MIP_Problem/Makefile.am | 1 + tests/Octagonal_Shape/Makefile.am | 1 + tests/PIP_Problem/Makefile.am | 1 + tests/Partially_Reduced_Product/Makefile.am | 1 + tests/Polyhedron/Makefile.am | 1 + tests/Powerset/Makefile.am | 1 + tests/Sparse_Matrix/Makefile.am | 1 + 14 files changed, 14 insertions(+), 0 deletions(-) diff --git a/Watchdog/tests/Makefile.am b/Watchdog/tests/Makefile.am index 1b5daa1..195e408 100644 --- a/Watchdog/tests/Makefile.am +++ b/Watchdog/tests/Makefile.am @@ -24,6 +24,7 @@ if VALGRIND_TESTS_ENABLED CHECKER = \ +libtool --mode=execute \ $(VALGRIND) --tool=memcheck -q --trace-children=yes --leak-check=yes \ --num-callers=40 --leak-resolution=high \ --suppressions=$(srcdir)/valgrind_suppressions diff --git a/tests/Ask_Tell/Makefile.am b/tests/Ask_Tell/Makefile.am index fa1138b..4848736 100644 --- a/tests/Ask_Tell/Makefile.am +++ b/tests/Ask_Tell/Makefile.am @@ -24,6 +24,7 @@ if VALGRIND_TESTS_ENABLED CHECKER = \ +libtool --mode=execute \ $(VALGRIND) --tool=memcheck -q --trace-children=yes --leak-check=yes \ --num-callers=40 --leak-resolution=high \ --suppressions=$(top_srcdir)/tests/valgrind_suppressions diff --git a/tests/BD_Shape/Makefile.am b/tests/BD_Shape/Makefile.am index 0d60c46..930d68e 100644 --- a/tests/BD_Shape/Makefile.am +++ b/tests/BD_Shape/Makefile.am @@ -24,6 +24,7 @@ if VALGRIND_TESTS_ENABLED CHECKER = \ +libtool --mode=execute \ $(VALGRIND) --tool=memcheck -q --trace-children=yes --leak-check=yes \ --num-callers=40 --leak-resolution=high \ --suppressions=$(top_srcdir)/tests/valgrind_suppressions diff --git a/tests/Box/Makefile.am b/tests/Box/Makefile.am index cceef3c..1a3d8ce 100644 --- a/tests/Box/Makefile.am +++ b/tests/Box/Makefile.am @@ -24,6 +24,7 @@ if VALGRIND_TESTS_ENABLED CHECKER = \ +libtool --mode=execute \ $(VALGRIND) --tool=memcheck -q --trace-children=yes --leak-check=yes \ --num-callers=40 --leak-resolution=high \ --suppressions=$(top_srcdir)/tests/valgrind_suppressions diff --git a/tests/CO_Tree/Makefile.am b/tests/CO_Tree/Makefile.am index 66c49c9..ae58ada 100644 --- a/tests/CO_Tree/Makefile.am +++ b/tests/CO_Tree/Makefile.am @@ -24,6 +24,7 @@ if VALGRIND_TESTS_ENABLED CHECKER = \ +libtool --mode=execute \ $(VALGRIND) --tool=memcheck -q --trace-children=yes --leak-check=yes \ --num-callers=40 --leak-resolution=high \ --suppressions=$(top_srcdir)/tests/valgrind_suppressions diff --git a/tests/Concrete_Expression/Makefile.am b/tests/Concrete_Expression/Makefile.am index dacaaee..3454958 100644 --- a/tests/Concrete_Expression/Makefile.am +++ b/tests/Concrete_Expression/Makefile.am @@ -24,6 +24,7 @@ if VALGRIND_TESTS_ENABLED CHECKER = \ +libtool --mode=execute \ $(VALGRIND) --tool=memcheck -q --trace-children=yes --leak-check=yes \ --num-callers=40 --leak-resolution=high \ --suppressions=$(top_srcdir)/tests/valgrind_suppressions diff --git a/tests/Grid/Makefile.am b/tests/Grid/Makefile.am index 2683683..8fc1ab1 100644 --- a/tests/Grid/Makefile.am +++ b/tests/Grid/Makefile.am @@ -25,6 +25,7 @@ if VALGRIND_TESTS_ENABLED CHECKER = \ +libtool --mode=execute \ $(VALGRIND) --tool=memcheck -q --trace-children=yes --leak-check=yes \ --num-callers=40 --leak-resolution=high \ --suppressions=$(top_srcdir)/tests/valgrind_suppressions diff --git a/tests/MIP_Problem/Makefile.am b/tests/MIP_Problem/Makefile.am index 4faf479..3f9ee7b 100644 --- a/tests/MIP_Problem/Makefile.am +++ b/tests/MIP_Problem/Makefile.am @@ -24,6 +24,7 @@ if VALGRIND_TESTS_ENABLED CHECKER = \ +libtool --mode=execute \ $(VALGRIND) --tool=memcheck -q --trace-children=yes --leak-check=yes \ --num-callers=40 --leak-resolution=high \ --suppressions=$(top_srcdir)/tests/valgrind_suppressions diff --git a/tests/Octagonal_Shape/Makefile.am b/tests/Octagonal_Shape/Makefile.am index 1c9795d..b9648a3 100644 --- a/tests/Octagonal_Shape/Makefile.am +++ b/tests/Octagonal_Shape/Makefile.am @@ -24,6 +24,7 @@ if VALGRIND_TESTS_ENABLED CHECKER = \ +libtool --mode=execute \ $(VALGRIND) --tool=memcheck -q --trace-children=yes --leak-check=yes \ --num-callers=40 --leak-resolution=high \ --suppressions=$(top_srcdir)/tests/valgrind_suppressions diff --git a/tests/PIP_Problem/Makefile.am b/tests/PIP_Problem/Makefile.am index 8bfd504..6102d97 100644 --- a/tests/PIP_Problem/Makefile.am +++ b/tests/PIP_Problem/Makefile.am @@ -24,6 +24,7 @@ if VALGRIND_TESTS_ENABLED CHECKER = \ +libtool --mode=execute \ $(VALGRIND) --tool=memcheck -q --trace-children=yes --leak-check=yes \ --num-callers=40 --leak-resolution=high \ --suppressions=$(top_srcdir)/tests/valgrind_suppressions diff --git a/tests/Partially_Reduced_Product/Makefile.am b/tests/Partially_Reduced_Product/Makefile.am index de605e4..10a14f1 100644 --- a/tests/Partially_Reduced_Product/Makefile.am +++ b/tests/Partially_Reduced_Product/Makefile.am @@ -25,6 +25,7 @@ if VALGRIND_TESTS_ENABLED CHECKER = \ +libtool --mode=execute \ $(VALGRIND) --tool=memcheck -q --trace-children=yes --leak-check=yes \ --num-callers=40 --leak-resolution=high \ --suppressions=$(top_srcdir)/tests/valgrind_suppressions diff --git a/tests/Polyhedron/Makefile.am b/tests/Polyhedron/Makefile.am index 337173a..571972c 100644 --- a/tests/Polyhedron/Makefile.am +++ b/tests/Polyhedron/Makefile.am @@ -24,6 +24,7 @@ if VALGRIND_TESTS_ENABLED CHECKER = \ +libtool --mode=execute \ $(VALGRIND) --tool=memcheck -q --trace-children=yes --leak-check=yes \ --num-callers=40 --leak-resolution=high \ --suppressions=$(top_srcdir)/tests/valgrind_suppressions diff --git a/tests/Powerset/Makefile.am b/tests/Powerset/Makefile.am index 8bf5750..df6075e 100644 --- a/tests/Powerset/Makefile.am +++ b/tests/Powerset/Makefile.am @@ -25,6 +25,7 @@ if VALGRIND_TESTS_ENABLED CHECKER = \ +libtool --mode=execute \ $(VALGRIND) --tool=memcheck -q --trace-children=yes --leak-check=yes \ --num-callers=40 --leak-resolution=high \ --suppressions=$(top_srcdir)/tests/valgrind_suppressions diff --git a/tests/Sparse_Matrix/Makefile.am b/tests/Sparse_Matrix/Makefile.am index 4baba61..ec1d8e5 100644 --- a/tests/Sparse_Matrix/Makefile.am +++ b/tests/Sparse_Matrix/Makefile.am @@ -24,6 +24,7 @@ if VALGRIND_TESTS_ENABLED CHECKER = \ +libtool --mode=execute \ $(VALGRIND) --tool=memcheck -q --trace-children=yes --leak-check=yes \ --num-callers=40 --leak-resolution=high \ --suppressions=$(top_srcdir)/tests/valgrind_suppressions

1 0

[GIT] ppl/ppl(master): Fixed value for Valgrind --num-callers option.
by Enea Zaffanella 13 Feb '12

13 Feb '12

Module: ppl/ppl Branch: master Commit: 4de3f8fdbdeb0d99e728dbfe9540b52daab08373 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=4de3f8fdbdeb… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Feb 13 15:19:24 2012 +0100 Fixed value for Valgrind --num-callers option. According to man pages, maximum value is 50. --- tests/Concrete_Expression/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tests/Concrete_Expression/Makefile.am b/tests/Concrete_Expression/Makefile.am index e52c1ac..dacaaee 100644 --- a/tests/Concrete_Expression/Makefile.am +++ b/tests/Concrete_Expression/Makefile.am @@ -25,7 +25,7 @@ if VALGRIND_TESTS_ENABLED CHECKER = \ $(VALGRIND) --tool=memcheck -q --trace-children=yes --leak-check=yes \ ---num-callers=100 --leak-resolution=high \ +--num-callers=40 --leak-resolution=high \ --suppressions=$(top_srcdir)/tests/valgrind_suppressions else !VALGRIND_TESTS_ENABLED

1 0

[GIT] ppl/ppl(master): Avoid pointer casts when allocating coefficients in Dense_Row::Impl.
by Enea Zaffanella 13 Feb '12

13 Feb '12

Module: ppl/ppl Branch: master Commit: 2622a438e6d247763b436b8eeefe2c15dd9bc7f1 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=2622a438e6d2… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Feb 13 14:54:20 2012 +0100 Avoid pointer casts when allocating coefficients in Dense_Row::Impl. Detected by ECLAIR service M++.5-2-8. We now use a std::allocator object (similar to what done in CO_Tree). --- src/Dense_Row.cc | 22 ++++++++-------------- src/Dense_Row.defs.hh | 4 ++++ src/Dense_Row.inlines.hh | 23 +++++++++++------------ 3 files changed, 23 insertions(+), 26 deletions(-) diff --git a/src/Dense_Row.cc b/src/Dense_Row.cc index 057e61b..031a57e 100644 --- a/src/Dense_Row.cc +++ b/src/Dense_Row.cc @@ -40,14 +40,12 @@ PPL::Dense_Row::resize(dimension_type new_size) { // Reallocation is required. // TODO: Consider using realloc() here. // TODO: Consider using a smarter allocation strategy. - dimension_type new_capacity = new_size; - Coefficient* new_vec = static_cast<Coefficient*>( - operator new(sizeof(Coefficient) * new_capacity)); + const dimension_type new_capacity = new_size; + Coefficient* new_vec = impl.coeff_allocator.allocate(new_capacity); if (impl.vec != 0) { memcpy(new_vec, impl.vec, sizeof(Coefficient) * impl.size); - - operator delete(impl.vec); + impl.coeff_allocator.deallocate(impl.vec, impl.capacity); } impl.vec = new_vec; @@ -87,27 +85,24 @@ PPL::Dense_Row::resize(dimension_type new_size, dimension_type new_capacity) { PPL_ASSERT(impl.size == new_size); - Coefficient* new_vec = static_cast<Coefficient*>( - operator new(sizeof(Coefficient) * new_capacity)); + Coefficient* new_vec = impl.coeff_allocator.allocate(new_capacity); PPL_ASSERT(impl.vec != 0); memcpy(new_vec, impl.vec, sizeof(Coefficient) * impl.size); - operator delete(impl.vec); + impl.coeff_allocator.deallocate(impl.vec, impl.capacity); impl.vec = new_vec; impl.capacity = new_capacity; } else { if (new_capacity > capacity()) { - Coefficient* new_vec = static_cast<Coefficient*>( - operator new(sizeof(Coefficient) * new_capacity)); + Coefficient* new_vec = impl.coeff_allocator.allocate(new_capacity); if (impl.vec != 0) { memcpy(new_vec, impl.vec, sizeof(Coefficient) * impl.size); - - operator delete(impl.vec); + impl.coeff_allocator.deallocate(impl.vec, impl.capacity); } impl.vec = new_vec; @@ -163,8 +158,7 @@ void PPL::Dense_Row::init(const Sparse_Row& row) { impl.capacity = row.size(); impl.flags = row.flags(); - impl.vec = static_cast<Coefficient*>( - operator new(sizeof(Coefficient) * impl.capacity)); + impl.vec = impl.coeff_allocator.allocate(impl.capacity); Sparse_Row::const_iterator itr = row.begin(); Sparse_Row::const_iterator itr_end = row.end(); while (impl.size != impl.capacity) { diff --git a/src/Dense_Row.defs.hh b/src/Dense_Row.defs.hh index ea3d5ff..0bcbd50 100644 --- a/src/Dense_Row.defs.hh +++ b/src/Dense_Row.defs.hh @@ -31,6 +31,7 @@ site: http://bugseng.com/products/ppl/ . */ #include "Sparse_Row.types.hh" #include "Row_Flags.defs.hh" #include "Coefficient.defs.hh" +#include <memory> #include <vector> #include <limits> @@ -393,6 +394,9 @@ private: //! The flags of this row. Row_Flags flags; + //! The allocator used to allocate/deallocate vec. + std::allocator<Coefficient> coeff_allocator; + //! The vector of coefficients. //! An empty vector may be stored as NULL instead of using a valid pointer. Coefficient* vec; diff --git a/src/Dense_Row.inlines.hh b/src/Dense_Row.inlines.hh index ba5c037..00d78d2 100644 --- a/src/Dense_Row.inlines.hh +++ b/src/Dense_Row.inlines.hh @@ -37,7 +37,7 @@ namespace Parma_Polyhedra_Library { inline Dense_Row::Impl::Impl() - : size(0), capacity(0), flags(), vec(0) { + : size(0), capacity(0), flags(), coeff_allocator(), vec(0) { } inline @@ -46,7 +46,7 @@ Dense_Row::Impl::~Impl() { --size; vec[size].~Coefficient(); } - operator delete(vec); + coeff_allocator.deallocate(vec, capacity); } inline dimension_type @@ -120,11 +120,11 @@ Dense_Row::Dense_Row(const Dense_Row& y) : impl() { impl.flags = y.flags(); + impl.coeff_allocator = y.impl.coeff_allocator; if (y.impl.vec != 0) { impl.capacity = y.capacity(); - impl.vec = static_cast<Coefficient*>( - operator new(sizeof(Coefficient) * impl.capacity)); + impl.vec = impl.coeff_allocator.allocate(impl.capacity); while (impl.size != y.size()) { new (&impl.vec[impl.size]) Coefficient(y[impl.size]); ++impl.size; @@ -143,10 +143,9 @@ Dense_Row::Dense_Row(const Dense_Row& y, PPL_ASSERT(capacity <= max_size()); impl.flags = y.flags(); - - impl.vec = static_cast<Coefficient*>( - operator new(sizeof(Coefficient) * capacity)); impl.capacity = capacity; + impl.coeff_allocator = y.impl.coeff_allocator; + impl.vec = impl.coeff_allocator.allocate(impl.capacity); if (y.impl.vec != 0) { while (impl.size != y.size()) { @@ -171,12 +170,11 @@ Dense_Row::Dense_Row(const Dense_Row& y, PPL_ASSERT(capacity != 0); impl.flags = y.flags(); - - impl.vec = static_cast<Coefficient*>( - operator new(sizeof(Coefficient) * capacity)); impl.capacity = capacity; + impl.coeff_allocator = y.impl.coeff_allocator; + impl.vec = impl.coeff_allocator.allocate(impl.capacity); - dimension_type n = std::min(sz, y.size()); + const dimension_type n = std::min(sz, y.size()); while (impl.size != n) { new (&impl.vec[impl.size]) Coefficient(y[impl.size]); ++impl.size; @@ -199,7 +197,7 @@ Dense_Row::~Dense_Row() { inline void Dense_Row::destroy() { resize(0); - operator delete(impl.vec); + impl.coeff_allocator.deallocate(impl.vec, impl.capacity); } inline void @@ -208,6 +206,7 @@ Dense_Row::m_swap(Dense_Row& y) { swap(impl.size, y.impl.size); swap(impl.capacity, y.impl.capacity); swap(impl.flags, y.impl.flags); + swap(impl.coeff_allocator, y.impl.coeff_allocator); swap(impl.vec, y.impl.vec); PPL_ASSERT(OK()); PPL_ASSERT(y.OK());

1 0

[GIT] ppl/ppl(master): For naming consistency, `coefficient_allocator' renamed as `data_allocator'.
by Enea Zaffanella 13 Feb '12

13 Feb '12

Module: ppl/ppl Branch: master Commit: b6bcf0a3f859871de9fb397308bb705a11440e38 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b6bcf0a3f859… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Feb 13 14:49:04 2012 +0100 For naming consistency, `coefficient_allocator' renamed as `data_allocator'. Explicitly include <memory> for std::allocator. Fixed deallocation bugs in CO_Tree::rebuild_bigger_tree(): - use delete[] for `indexes'; - use data_allocator.deallocayte for `data'. On copy construction, assignment and swap, do also copy/assign/swap the allocator. --- src/CO_Tree.cc | 17 ++++++++--------- src/CO_Tree.defs.hh | 10 ++++++---- src/CO_Tree.inlines.hh | 16 +++++----------- 3 files changed, 19 insertions(+), 24 deletions(-) diff --git a/src/CO_Tree.cc b/src/CO_Tree.cc index 68f9fe0..fc79a0b 100644 --- a/src/CO_Tree.cc +++ b/src/CO_Tree.cc @@ -521,9 +521,9 @@ PPL::CO_Tree::init(dimension_type reserved_size1) { reserved_size = ((dimension_type)1 << max_depth) - 1; indexes = new dimension_type[reserved_size + 2]; try { - data = coefficient_allocator.allocate(reserved_size + 1); + data = data_allocator.allocate(reserved_size + 1); } catch (...) { - delete [] indexes; + delete[] indexes; throw; } // Mark all pairs as unused. @@ -549,8 +549,8 @@ PPL::CO_Tree::destroy() { data[i].~data_type(); } - delete [] indexes; - coefficient_allocator.deallocate(data, reserved_size + 1); + delete[] indexes; + data_allocator.deallocate(data, reserved_size + 1); } } @@ -704,9 +704,9 @@ PPL::CO_Tree::rebuild_bigger_tree() { data_type* new_data; try { - new_data = coefficient_allocator.allocate(new_reserved_size + 1); + new_data = data_allocator.allocate(new_reserved_size + 1); } catch (...) { - delete new_indexes; + delete[] new_indexes; throw; } @@ -724,8 +724,8 @@ PPL::CO_Tree::rebuild_bigger_tree() { new_indexes[0] = 0; new_indexes[new_reserved_size + 1] = 0; - delete [] indexes; - operator delete(data); + delete[] indexes; + data_allocator.deallocate(data, reserved_size + 1); indexes = new_indexes; data = new_data; @@ -1089,7 +1089,6 @@ PPL::CO_Tree::move_data_from(CO_Tree& tree) { void PPL::CO_Tree::copy_data_from(const CO_Tree& x) { - PPL_ASSERT(size_ == 0); PPL_ASSERT(reserved_size == x.reserved_size); PPL_ASSERT(structure_OK()); diff --git a/src/CO_Tree.defs.hh b/src/CO_Tree.defs.hh index 2c8a5ca..4254796 100644 --- a/src/CO_Tree.defs.hh +++ b/src/CO_Tree.defs.hh @@ -27,6 +27,7 @@ site: http://bugseng.com/products/ppl/ . */ #include "CO_Tree.types.hh" #include "Coefficient.defs.hh" +#include <memory> #ifndef PPL_CO_TREE_EXTRA_DEBUG #ifdef PPL_ABI_BREAKING_EXTRA_DEBUG @@ -1012,8 +1013,8 @@ private: //! Compares the fractions numer/denom with ratio/100. /*! - \returns - Returns true if the fraction numer/denom is less than the fraction ratio/100. + \returns Returns true if the fraction numer/denom is less + than the fraction ratio/100. \param ratio It must be less than or equal to 100. @@ -1279,6 +1280,9 @@ private: */ dimension_type* indexes; + //! The allocator used to allocate/deallocate data. + std::allocator<data_type> data_allocator; + //! The vector that contains the data of the keys in the tree. /*! If index[i] is \p unused_index, data[i] is unused. @@ -1299,8 +1303,6 @@ private: //! The number of values stored in the tree. dimension_type size_; - - std::allocator<Coefficient> coefficient_allocator; }; class CO_Tree::tree_iterator { diff --git a/src/CO_Tree.inlines.hh b/src/CO_Tree.inlines.hh index 546817b..50a03e7 100644 --- a/src/CO_Tree.inlines.hh +++ b/src/CO_Tree.inlines.hh @@ -46,33 +46,26 @@ CO_Tree::dfs_index(iterator itr) const { inline CO_Tree::CO_Tree() { - init(0); - PPL_ASSERT(OK()); } inline CO_Tree::CO_Tree(const CO_Tree& x) { - PPL_ASSERT(x.OK()); - + data_allocator = x.data_allocator; init(x.reserved_size); - copy_data_from(x); } inline CO_Tree& CO_Tree::operator=(const CO_Tree& x) { - if (this != &x) { - destroy(); + data_allocator = x.data_allocator; init(x.reserved_size); - copy_data_from(x); } - return *this; } @@ -178,11 +171,12 @@ CO_Tree::m_swap(CO_Tree& x) { using std::swap; swap(max_depth, x.max_depth); swap(indexes, x.indexes); + swap(data_allocator, x.data_allocator); swap(data, x.data); swap(reserved_size, x.reserved_size); swap(size_, x.size_); - // Cached iterators have been invalidated by the swap, they must be - // refreshed here. + // Cached iterators have been invalidated by the swap, + // they must be refreshed here. refresh_cached_iterators(); x.refresh_cached_iterators(); PPL_ASSERT(structure_OK());

1 0

[GIT] ppl/ppl(master): Reduce scope of loop index variable.
by Enea Zaffanella 13 Feb '12

13 Feb '12

Module: ppl/ppl Branch: master Commit: 230921583305ca2fe45f474fe7763ee238441691 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=230921583305… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Feb 13 09:23:49 2012 +0100 Reduce scope of loop index variable. Detected by ECLAIR service minscope. --- src/Box.templates.hh | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/Box.templates.hh b/src/Box.templates.hh index e62d8df..341c111 100644 --- a/src/Box.templates.hh +++ b/src/Box.templates.hh @@ -1920,8 +1920,7 @@ Box<ITV>::simplify_using_context_assign(const Box& y) { } // Loop index `i' is intentionally going upwards. - dimension_type i = 0; - for ( ; i < num_dims; ++i) { + for (dimension_type i = 0; i < num_dims; ++i) { if (!x.seq[i].simplify_using_context_assign(y.seq[i])) { PPL_ASSERT(!x.seq[i].is_empty()); // The intersection of `x' and `y' is empty due to the i-th interval:

1 0

[GIT] ppl/ppl(master): Make sure each case within a switch statement is properly terminated.
by Roberto Bagnara 12 Feb '12

12 Feb '12

Module: ppl/ppl Branch: master Commit: ab67c65fbe7043f3d3defced489c04494909345c URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ab67c65fbe70… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Feb 12 21:43:25 2012 +0100 Make sure each case within a switch statement is properly terminated. Detected by ECLAIR service swchbrek. --- src/BD_Shape.templates.hh | 2 ++ src/Grid_conversion.cc | 2 ++ src/Grid_public.cc | 5 +++-- src/Grid_simplify.cc | 2 ++ src/Octagonal_Shape.templates.hh | 2 ++ 5 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/BD_Shape.templates.hh b/src/BD_Shape.templates.hh index 8b74cac..8ef7bfe 100644 --- a/src/BD_Shape.templates.hh +++ b/src/BD_Shape.templates.hh @@ -1512,6 +1512,8 @@ BD_Shape<T>::relation_with(const Constraint& c) const { case -1: return Poly_Con_Relation::strictly_intersects(); } + PPL_UNREACHABLE; + break; case 0: if (min_numer == 0) { if (c.is_strict_inequality()) diff --git a/src/Grid_conversion.cc b/src/Grid_conversion.cc index 0149624..2cbcee5 100644 --- a/src/Grid_conversion.cc +++ b/src/Grid_conversion.cc @@ -464,8 +464,10 @@ Grid::conversion(Congruence_System& source, Grid_Generator_System& dest, switch (dim_kinds[dim]) { case PARAMETER: dest[row].set_divisor(system_divisor); + // Intentionally fall through. case LINE: --row; + // Intentionally fall through. case GEN_VIRTUAL: break; } diff --git a/src/Grid_public.cc b/src/Grid_public.cc index 1d778b2..ad38d6e 100644 --- a/src/Grid_public.cc +++ b/src/Grid_public.cc @@ -637,7 +637,8 @@ PPL::Grid::relation_with(const Constraint& c) const { point_is_included = !c.is_equality(); break; } - // Not the first point: convert `g' to be a parameter ... + // Not the first point: convert `g' to be a parameter + // and fall through into the parameter case. Grid_Generator& gen = const_cast<Grid_Generator&>(g); const Grid_Generator& point = *first_point; const Coefficient& p_div = g[0]; @@ -658,8 +659,8 @@ PPL::Grid::relation_with(const Constraint& c) const { gen.strong_normalize(); gen.set_is_parameter(); PPL_ASSERT(gen.OK()); - // ... and fall through into the parameter case. } + // Intentionally fall through. case Grid_Generator::PARAMETER: case Grid_Generator::LINE: diff --git a/src/Grid_simplify.cc b/src/Grid_simplify.cc index 38b0807..3a08160 100644 --- a/src/Grid_simplify.cc +++ b/src/Grid_simplify.cc @@ -365,8 +365,10 @@ Grid::simplify(Grid_Generator_System& sys, Dimension_Kinds& dim_kinds) { switch (dim_kinds[dim]) { case PARAMETER: sys[row].set_divisor(system_divisor); + // Intentionally fall through. case LINE: --row; + // Intentionally fall through. case GEN_VIRTUAL: break; } diff --git a/src/Octagonal_Shape.templates.hh b/src/Octagonal_Shape.templates.hh index 1c47af1..27bcd0a 100644 --- a/src/Octagonal_Shape.templates.hh +++ b/src/Octagonal_Shape.templates.hh @@ -1937,6 +1937,8 @@ Octagonal_Shape<T>::relation_with(const Constraint& c) const { case -1: return Poly_Con_Relation::strictly_intersects(); } + PPL_UNREACHABLE; + break; case 0: if (min_numer == 0) { if (c.is_strict_inequality())

1 0

[GIT] ppl/ppl(master): Spurious spaces removed.
by Roberto Bagnara 12 Feb '12

12 Feb '12

Module: ppl/ppl Branch: master Commit: 723a711049fe8b07edd9781111e6394248fd3ecd URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=723a711049fe… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Feb 12 21:08:36 2012 +0100 Spurious spaces removed. --- src/BD_Shape.templates.hh | 40 +++++++++++++++++++------------------- src/Octagonal_Shape.templates.hh | 40 +++++++++++++++++++------------------- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/src/BD_Shape.templates.hh b/src/BD_Shape.templates.hh index 7fe9743..8b74cac 100644 --- a/src/BD_Shape.templates.hh +++ b/src/BD_Shape.templates.hh @@ -1470,27 +1470,27 @@ BD_Shape<T>::relation_with(const Constraint& c) const { switch (sgn(min_numer)) { case 1: if (c.is_equality()) - return Poly_Con_Relation::is_disjoint(); - return Poly_Con_Relation::is_included(); + return Poly_Con_Relation::is_disjoint(); + return Poly_Con_Relation::is_included(); case 0: if (c.is_strict_inequality() || c.is_equality()) - return Poly_Con_Relation::strictly_intersects(); - return Poly_Con_Relation::is_included(); + return Poly_Con_Relation::strictly_intersects(); + return Poly_Con_Relation::is_included(); case -1: - return Poly_Con_Relation::strictly_intersects(); + return Poly_Con_Relation::strictly_intersects(); } } if (!bounded_below) { max_numer += c.inhomogeneous_term() * max_denom; switch (sgn(max_numer)) { case 1: - return Poly_Con_Relation::strictly_intersects(); + return Poly_Con_Relation::strictly_intersects(); case 0: if (c.is_strict_inequality()) - return Poly_Con_Relation::is_disjoint(); - return Poly_Con_Relation::strictly_intersects(); + return Poly_Con_Relation::is_disjoint(); + return Poly_Con_Relation::strictly_intersects(); case -1: - return Poly_Con_Relation::is_disjoint(); + return Poly_Con_Relation::is_disjoint(); } } else { @@ -1501,30 +1501,30 @@ BD_Shape<T>::relation_with(const Constraint& c) const { switch (sgn(min_numer)) { case 1: if (c.is_equality()) - return Poly_Con_Relation::is_disjoint(); - return Poly_Con_Relation::is_included(); + return Poly_Con_Relation::is_disjoint(); + return Poly_Con_Relation::is_included(); case 0: if (c.is_equality()) - return Poly_Con_Relation::strictly_intersects(); + return Poly_Con_Relation::strictly_intersects(); if (c.is_strict_inequality()) - return Poly_Con_Relation::strictly_intersects(); - return Poly_Con_Relation::is_included(); + return Poly_Con_Relation::strictly_intersects(); + return Poly_Con_Relation::is_included(); case -1: - return Poly_Con_Relation::strictly_intersects(); + return Poly_Con_Relation::strictly_intersects(); } case 0: if (min_numer == 0) { if (c.is_strict_inequality()) - return Poly_Con_Relation::is_disjoint() + return Poly_Con_Relation::is_disjoint() && Poly_Con_Relation::saturates(); - return Poly_Con_Relation::is_included() + return Poly_Con_Relation::is_included() && Poly_Con_Relation::saturates(); } if (c.is_strict_inequality()) - return Poly_Con_Relation::is_disjoint(); - return Poly_Con_Relation::strictly_intersects(); + return Poly_Con_Relation::is_disjoint(); + return Poly_Con_Relation::strictly_intersects(); case -1: - return Poly_Con_Relation::is_disjoint(); + return Poly_Con_Relation::is_disjoint(); } } } diff --git a/src/Octagonal_Shape.templates.hh b/src/Octagonal_Shape.templates.hh index 36338be..1c47af1 100644 --- a/src/Octagonal_Shape.templates.hh +++ b/src/Octagonal_Shape.templates.hh @@ -1895,27 +1895,27 @@ Octagonal_Shape<T>::relation_with(const Constraint& c) const { switch (sgn(min_numer)) { case 1: if (c.is_equality()) - return Poly_Con_Relation::is_disjoint(); - return Poly_Con_Relation::is_included(); + return Poly_Con_Relation::is_disjoint(); + return Poly_Con_Relation::is_included(); case 0: if (c.is_strict_inequality() || c.is_equality()) - return Poly_Con_Relation::strictly_intersects(); - return Poly_Con_Relation::is_included(); + return Poly_Con_Relation::strictly_intersects(); + return Poly_Con_Relation::is_included(); case -1: - return Poly_Con_Relation::strictly_intersects(); + return Poly_Con_Relation::strictly_intersects(); } } if (!bounded_below) { max_numer += c.inhomogeneous_term() * max_denom; switch (sgn(max_numer)) { case 1: - return Poly_Con_Relation::strictly_intersects(); + return Poly_Con_Relation::strictly_intersects(); case 0: if (c.is_strict_inequality()) - return Poly_Con_Relation::is_disjoint(); - return Poly_Con_Relation::strictly_intersects(); + return Poly_Con_Relation::is_disjoint(); + return Poly_Con_Relation::strictly_intersects(); case -1: - return Poly_Con_Relation::is_disjoint(); + return Poly_Con_Relation::is_disjoint(); } } else { @@ -1926,30 +1926,30 @@ Octagonal_Shape<T>::relation_with(const Constraint& c) const { switch (sgn(min_numer)) { case 1: if (c.is_equality()) - return Poly_Con_Relation::is_disjoint(); - return Poly_Con_Relation::is_included(); + return Poly_Con_Relation::is_disjoint(); + return Poly_Con_Relation::is_included(); case 0: if (c.is_equality()) - return Poly_Con_Relation::strictly_intersects(); + return Poly_Con_Relation::strictly_intersects(); if (c.is_strict_inequality()) - return Poly_Con_Relation::strictly_intersects(); - return Poly_Con_Relation::is_included(); + return Poly_Con_Relation::strictly_intersects(); + return Poly_Con_Relation::is_included(); case -1: - return Poly_Con_Relation::strictly_intersects(); + return Poly_Con_Relation::strictly_intersects(); } case 0: if (min_numer == 0) { if (c.is_strict_inequality()) - return Poly_Con_Relation::is_disjoint() + return Poly_Con_Relation::is_disjoint() && Poly_Con_Relation::saturates(); - return Poly_Con_Relation::is_included() + return Poly_Con_Relation::is_included() && Poly_Con_Relation::saturates(); } if (c.is_strict_inequality()) - return Poly_Con_Relation::is_disjoint(); - return Poly_Con_Relation::strictly_intersects(); + return Poly_Con_Relation::is_disjoint(); + return Poly_Con_Relation::strictly_intersects(); case -1: - return Poly_Con_Relation::is_disjoint(); + return Poly_Con_Relation::is_disjoint(); } } }

1 0