X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=isl_map.c;h=c4636c146c83c2d370d27650c9c734d6eb9313cd;hb=de51a9bc4da5dd3f1f9f57c2362da6f9752c44e0;hp=b383cfeb0771cc709d51430a847e46f92776ffe6;hpb=176bc844c93de500b29e6f0c815d69fd76c3c475;p=platform%2Fupstream%2Fisl.git

diff --git a/isl_map.c b/isl_map.c
index b383cfe..c4636c1 100644
--- a/isl_map.c
+++ b/isl_map.c
@@ -1145,6 +1145,13 @@ int isl_basic_set_drop_equality(struct isl_basic_set *bset, unsigned pos)
 	return isl_basic_map_drop_equality((struct isl_basic_map *)bset, pos);
 }
 
+/* Turn inequality "pos" of "bmap" into an equality.
+ *
+ * In particular, we move the inequality in front of the equalities
+ * and move the last inequality in the position of the moved inequality.
+ * Note that isl_tab_make_equalities_explicit depends on this particular
+ * change in the ordering of the constraints.
+ */
 void isl_basic_map_inequality_to_equality(
 		struct isl_basic_map *bmap, unsigned pos)
 {
@@ -3045,6 +3052,7 @@ __isl_give isl_basic_map *isl_basic_map_insert_dims(
 		res = isl_basic_map_set_rational(res);
 	if (isl_basic_map_plain_is_empty(bmap)) {
 		isl_basic_map_free(bmap);
+		free(dim_map);
 		return isl_basic_map_set_to_empty(res);
 	}
 	res = isl_basic_map_add_constraints_dim_map(res, bmap, dim_map);
@@ -3220,6 +3228,8 @@ __isl_give isl_basic_map *isl_basic_map_move_dims(
 	res = isl_basic_map_alloc_space(isl_basic_map_get_space(bmap),
 			bmap->n_div, bmap->n_eq, bmap->n_ineq);
 	bmap = isl_basic_map_add_constraints_dim_map(res, bmap, dim_map);
+	if (!bmap)
+		goto error;
 
 	bmap->dim = isl_space_move_dims(bmap->dim, dst_type, dst_pos,
 					src_type, src_pos, n);
@@ -6331,7 +6341,11 @@ static struct isl_set *parameter_compute_divs(struct isl_basic_set *bset)
 	if (bset->n_eq == 0)
 		return isl_basic_set_lexmin(bset);
 
-	isl_basic_set_gauss(bset, NULL);
+	bset = isl_basic_set_gauss(bset, NULL);
+	if (!bset)
+		return NULL;
+	if (isl_basic_set_plain_is_empty(bset))
+		return isl_set_from_basic_set(bset);
 
 	nparam = isl_basic_set_dim(bset, isl_dim_param);
 	n_div = isl_basic_set_dim(bset, isl_dim_div);
@@ -8191,13 +8205,13 @@ static int qsort_constraint_cmp(const void *p1, const void *p2)
 	int l1, l2;
 	unsigned size = isl_min(c1->size, c2->size);
 
-	l1 = isl_seq_last_non_zero(c1->c, size);
-	l2 = isl_seq_last_non_zero(c2->c, size);
+	l1 = isl_seq_last_non_zero(c1->c + 1, size);
+	l2 = isl_seq_last_non_zero(c2->c + 1, size);
 
 	if (l1 != l2)
 		return l1 - l2;
 
-	return isl_seq_cmp(c1->c, c2->c, size);
+	return isl_seq_cmp(c1->c + 1, c2->c + 1, size);
 }
 
 static struct isl_basic_map *isl_basic_map_sort_constraints(
@@ -10387,6 +10401,9 @@ __isl_give isl_basic_map *isl_basic_map_curry(__isl_take isl_basic_map *bmap)
 	if (!isl_basic_map_can_curry(bmap))
 		isl_die(bmap->ctx, isl_error_invalid,
 			"basic map cannot be curried", goto error);
+	bmap = isl_basic_map_cow(bmap);
+	if (!bmap)
+		return NULL;
 	bmap->dim = isl_space_curry(bmap->dim);
 	if (!bmap->dim)
 		goto error;
@@ -10465,6 +10482,9 @@ __isl_give isl_basic_map *isl_basic_map_uncurry(__isl_take isl_basic_map *bmap)
 		isl_die(bmap->ctx, isl_error_invalid,
 			"basic map cannot be uncurried",
 			return isl_basic_map_free(bmap));
+	bmap = isl_basic_map_cow(bmap);
+	if (!bmap)
+		return NULL;
 	bmap->dim = isl_space_uncurry(bmap->dim);
 	if (!bmap->dim)
 		return isl_basic_map_free(bmap);