Merge branch 'maint'

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

diff --git a/isl_union_map.c b/isl_union_map.c
index 461c504..d27d5c5 100644 (file)
--- a/isl_union_map.c
+++ b/isl_union_map.c
@@ -1175,10 +1175,22 @@ __isl_give isl_union_map *isl_union_map_product(__isl_take isl_union_map *umap1,
        return bin_op(umap1, umap2, &product_entry);
 }
 
+static int set_product_entry(void **entry, void *user)
+{
+       struct isl_union_map_bin_data *data = user;
+       isl_set *set2 = *entry;
+
+       set2 = isl_set_product(isl_set_copy(data->map), isl_set_copy(set2));
+
+       data->res = isl_union_set_add_set(data->res, set2);
+
+       return 0;
+}
+
 __isl_give isl_union_set *isl_union_set_product(__isl_take isl_union_set *uset1,
        __isl_take isl_union_set *uset2)
 {
-       return isl_union_map_product(uset1, uset2);
+       return bin_op(uset1, uset2, &set_product_entry);
 }
 
 static int range_product_entry(void **entry, void *user)
@@ -1700,6 +1712,11 @@ static int is_subset_entry(void **entry, void *user)
        entry2 = isl_hash_table_find(data->umap2->dim->ctx, &data->umap2->table,
                                     hash, &has_dim, map->dim, 0);
        if (!entry2) {
+               int empty = isl_map_is_empty(map);
+               if (empty < 0)
+                       return -1;
+               if (empty)
+                       return 0;
                data->is_subset = 0;
                return -1;
        }