add isl_pw_multi_aff_from_multi_aff

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

diff --git a/isl_pw_templ.c b/isl_pw_templ.c
index 27da2c4..6a941c5 100644 (file)
--- a/isl_pw_templ.c
+++ b/isl_pw_templ.c
@@ -179,6 +179,11 @@ const char *FN(PW,get_dim_name)(__isl_keep PW *pw, enum isl_dim_type type,
        return pw ? isl_space_get_dim_name(pw->dim, type, pos) : NULL;
 }
 
+int FN(PW,has_dim_id)(__isl_keep PW *pw, enum isl_dim_type type, unsigned pos)
+{
+       return pw ? isl_space_has_dim_id(pw->dim, type, pos) : -1;
+}
+
 __isl_give isl_id *FN(PW,get_dim_id)(__isl_keep PW *pw, enum isl_dim_type type,
        unsigned pos)
 {
@@ -366,14 +371,14 @@ static __isl_give PW *FN(PW,union_add_aligned)(__isl_take PW *pw1,
                for (j = 0; j < pw2->n; ++j) {
                        struct isl_set *common;
                        EL *sum;
-                       set = isl_set_subtract(set,
-                                       isl_set_copy(pw2->p[j].set));
                        common = isl_set_intersect(isl_set_copy(pw1->p[i].set),
                                                isl_set_copy(pw2->p[j].set));
                        if (isl_set_plain_is_empty(common)) {
                                isl_set_free(common);
                                continue;
                        }
+                       set = isl_set_subtract(set,
+                                       isl_set_copy(pw2->p[j].set));
 
                        sum = FN(EL,add_on_domain)(common,
                                                   FN(EL,copy)(pw1->p[i].FIELD),
@@ -518,7 +523,7 @@ static __isl_give PW *FN(PW,on_shared_domain)(__isl_take PW *pw1,
        __isl_give EL *(*fn)(__isl_take EL *el1, __isl_take EL *el2))
 {
        int i, j, n;
-       PW *res;
+       PW *res = NULL;
 
        if (!pw1 || !pw2)
                goto error;
@@ -534,16 +539,22 @@ static __isl_give PW *FN(PW,on_shared_domain)(__isl_take PW *pw1,
                for (j = 0; j < pw2->n; ++j) {
                        isl_set *common;
                        EL *res_ij;
+                       int empty;
+
                        common = isl_set_intersect(
                                        isl_set_copy(pw1->p[i].set),
                                        isl_set_copy(pw2->p[j].set));
-                       if (isl_set_plain_is_empty(common)) {
+                       empty = isl_set_plain_is_empty(common);
+                       if (empty < 0 || empty) {
                                isl_set_free(common);
+                               if (empty < 0)
+                                       goto error;
                                continue;
                        }
 
                        res_ij = fn(FN(EL,copy)(pw1->p[i].FIELD),
                                    FN(EL,copy)(pw2->p[j].FIELD));
+                       res_ij = FN(EL,gist)(res_ij, isl_set_copy(common));
 
                        res = FN(PW,add_piece)(res, common, res_ij);
                }
@@ -555,6 +566,7 @@ static __isl_give PW *FN(PW,on_shared_domain)(__isl_take PW *pw1,
 error:
        FN(PW,free)(pw1);
        FN(PW,free)(pw2);
+       FN(PW,free)(res);
        return NULL;
 }
 
@@ -1292,6 +1304,11 @@ error:
 }
 #endif
 
+int FN(PW,n_piece)(__isl_keep PW *pw)
+{
+       return pw ? pw->n : 0;
+}
+
 int FN(PW,foreach_piece)(__isl_keep PW *pw,
        int (*fn)(__isl_take isl_set *set, __isl_take EL *el, void *user),
        void *user)
@@ -1433,7 +1450,7 @@ __isl_give PW *FN(PW,mul_isl_int)(__isl_take PW *pw, isl_int v)
 
        if (isl_int_is_one(v))
                return pw;
-       if (pw && isl_int_is_zero(v)) {
+       if (pw && DEFAULT_IS_ZERO && isl_int_is_zero(v)) {
                PW *zero;
                isl_space *dim = FN(PW,get_space)(pw);
 #ifdef HAS_TYPE