Merge branch 'maint'

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

diff --git a/isl_vertices.c b/isl_vertices.c
index e9fd6f6..9611d6b 100644 (file)
--- a/isl_vertices.c
+++ b/isl_vertices.c
@@ -8,10 +8,10 @@
  * 91893 Orsay, France 
  */
 
-#include <isl_set.h>
-#include <isl_seq.h>
-#include <isl_tab.h>
 #include <isl_map_private.h>
+#include <isl/set.h>
+#include <isl/seq.h>
+#include <isl_tab.h>
 #include <isl_dim_private.h>
 #include <isl_morph.h>
 #include <isl_vertices_private.h>
@@ -392,10 +392,10 @@ __isl_give isl_vertices *isl_basic_set_compute_vertices(
        int level;
        int init;
        unsigned nvar;
-       int *selection;
+       int *selection = NULL;
        int selected;
-       struct isl_tab_undo **snap;
-       isl_mat *facets;
+       struct isl_tab_undo **snap = NULL;
+       isl_mat *facets = NULL;
        struct isl_vertex_list *list = NULL;
        int n_vertices = 0;
        isl_vertices *vertices;
@@ -403,7 +403,7 @@ __isl_give isl_vertices *isl_basic_set_compute_vertices(
        if (!bset)
                return NULL;
 
-       if (isl_basic_set_fast_is_empty(bset))
+       if (isl_basic_set_plain_is_empty(bset))
                return vertices_empty(bset);
 
        if (bset->n_eq != 0)
@@ -546,9 +546,11 @@ static __isl_give isl_vertices *vertices_add_chambers(
        struct isl_chamber_list *list)
 {
        int i;
+       isl_ctx *ctx;
        struct isl_chamber_list *next;
 
-       vertices->c = isl_alloc_array(vertices->ctx, struct isl_chamber, n_chambers);
+       ctx = isl_vertices_get_ctx(vertices);
+       vertices->c = isl_alloc_array(ctx, struct isl_chamber, n_chambers);
        if (!vertices->c)
                goto error;
        vertices->n_chambers = n_chambers;
@@ -769,7 +771,7 @@ static int has_opposite(struct isl_facet_todo *todo,
 {
        for (; *list; list = &(*list)->next) {
                int eq;
-               eq = isl_basic_set_fast_is_equal(todo->bset, (*list)->bset);
+               eq = isl_basic_set_plain_is_equal(todo->bset, (*list)->bset);
                if (eq < 0)
                        return -1;
                if (!eq)
@@ -855,6 +857,7 @@ static __isl_give isl_vertices *compute_chambers(__isl_take isl_basic_set *bset,
        __isl_take isl_vertices *vertices)
 {
        int i;
+       isl_ctx *ctx;
        isl_vec *sample = NULL;
        struct isl_tab *tab = NULL;
        struct isl_tab_undo *snap;
@@ -867,7 +870,8 @@ static __isl_give isl_vertices *compute_chambers(__isl_take isl_basic_set *bset,
        if (!bset || !vertices)
                goto error;
 
-       selection = isl_alloc_array(vertices->ctx, int, vertices->n_vertices);
+       ctx = isl_vertices_get_ctx(vertices);
+       selection = isl_alloc_array(ctx, int, vertices->n_vertices);
        if (!selection)
                goto error;
 
@@ -1013,12 +1017,14 @@ __isl_give isl_basic_set *isl_vertex_get_expr(__isl_keep isl_vertex *vertex)
 static __isl_give isl_vertex *isl_vertex_alloc(__isl_take isl_vertices *vertices,
        int id)
 {
+       isl_ctx *ctx;
        isl_vertex *vertex;
 
        if (!vertices)
                return NULL;
 
-       vertex = isl_alloc_type(vertices->ctx, isl_vertex);
+       ctx = isl_vertices_get_ctx(vertices);
+       vertex = isl_alloc_type(ctx, isl_vertex);
        if (!vertex)
                goto error;
 
@@ -1474,9 +1480,11 @@ static int triangulate(__isl_keep isl_cell *cell, __isl_keep isl_vec *v,
        int i, j, k;
        int d, nparam;
        int *ids;
+       isl_ctx *ctx;
        isl_basic_set *vertex;
        isl_basic_set *bset;
 
+       ctx = isl_cell_get_ctx(cell);
        d = isl_basic_set_dim(cell->vertices->bset, isl_dim_set);
        nparam = isl_basic_set_dim(cell->vertices->bset, isl_dim_param);