isl_tab_detect_redundant: return status instead of isl_tab *

[platform/upstream/isl.git] / isl_convex_hull.c

diff --git a/isl_convex_hull.c b/isl_convex_hull.c
index 449aa83..c6f2806 100644 (file)
--- a/isl_convex_hull.c
+++ b/isl_convex_hull.c
@@ -94,13 +94,18 @@ struct isl_basic_map *isl_basic_map_convex_hull(struct isl_basic_map *bmap)
                return bmap;
 
        tab = isl_tab_from_basic_map(bmap);
-       tab = isl_tab_detect_equalities(tab);
-       tab = isl_tab_detect_redundant(tab);
+       tab = isl_tab_detect_implicit_equalities(tab);
+       if (isl_tab_detect_redundant(tab) < 0)
+               goto error;
        bmap = isl_basic_map_update_from_tab(bmap, tab);
        isl_tab_free(tab);
        ISL_F_SET(bmap, ISL_BASIC_MAP_NO_IMPLICIT);
        ISL_F_SET(bmap, ISL_BASIC_MAP_NO_REDUNDANT);
        return bmap;
+error:
+       isl_tab_free(tab);
+       isl_basic_map_free(bmap);
+       return NULL;
 }
 
 struct isl_basic_set *isl_basic_set_convex_hull(struct isl_basic_set *bset)
@@ -282,7 +287,6 @@ static struct isl_basic_set *isl_basic_set_add_equality(
        struct isl_basic_set *bset, isl_int *c)
 {
        int i;
-       unsigned total;
        unsigned dim;
 
        if (ISL_F_ISSET(bset, ISL_BASIC_SET_EMPTY))
@@ -667,7 +671,6 @@ static struct isl_basic_set *extend(struct isl_basic_set *hull,
        int k;
        struct isl_basic_set *facet = NULL;
        struct isl_basic_set *hull_facet = NULL;
-       unsigned total;
        unsigned dim;
 
        isl_assert(set->ctx, set->n > 0, goto error);
@@ -939,7 +942,7 @@ static int isl_basic_set_is_bounded(struct isl_basic_set *bset)
        struct isl_tab *tab;
        int bounded;
 
-       tab = isl_tab_from_recession_cone((struct isl_basic_map *)bset);
+       tab = isl_tab_from_recession_cone(bset);
        bounded = isl_tab_cone_is_bounded(tab);
        isl_tab_free(tab);
        return bounded;
@@ -1786,7 +1789,6 @@ static struct isl_basic_set *uset_convex_hull_wrap(struct isl_set *set)
  */
 static struct isl_basic_set *uset_convex_hull(struct isl_set *set)
 {
-       int i;
        struct isl_basic_set *convex_hull = NULL;
        struct isl_basic_set *lin;
 
@@ -1835,7 +1837,6 @@ error:
  */
 static struct isl_basic_set *uset_convex_hull_wrap_bounded(struct isl_set *set)
 {
-       int i;
        struct isl_basic_set *convex_hull = NULL;
 
        if (isl_set_n_dim(set) == 0) {
@@ -2239,7 +2240,7 @@ static struct isl_basic_set *uset_simple_hull(struct isl_set *set)
        struct sh_data *data = NULL;
        struct isl_basic_set *hull = NULL;
        unsigned n_ineq;
-       int i, j;
+       int i;
 
        if (!set)
                return NULL;