Merge branch 'maint'

diff --cc isl_map.c
index d311a4c,eb1ecf1..15af7dd
--- 1/isl_map.c
--- 2/isl_map.c
+++ b/isl_map.c
@@@ -1755,35 -1573,23 +1755,35 @@@ int isl_map_involves_dims(__isl_keep is
  {
        int i;
  
 -      if (!set)
 +      if (!map)
                return -1;
  
 -      if (first + n > isl_set_dim(set, type))
 -              isl_die(set->ctx, isl_error_invalid,
 +      if (first + n > isl_map_dim(map, type))
 +              isl_die(map->ctx, isl_error_invalid,
                        "index out of bounds", return -1);
  
 -      for (i = 0; i < set->n; ++i) {
 -              int involves = isl_basic_set_involves_dims(set->p[i],
 +      for (i = 0; i < map->n; ++i) {
 +              int involves = isl_basic_map_involves_dims(map->p[i],
                                                            type, first, n);
-               if (involves < 0 || !involves)
+               if (involves < 0 || involves)
                        return involves;
        }
  
-       return 1;
+       return 0;
  }
  
 +int isl_basic_set_involves_dims(__isl_keep isl_basic_set *bset,
 +      enum isl_dim_type type, unsigned first, unsigned n)
 +{
 +      return isl_basic_map_involves_dims(bset, type, first, n);
 +}
 +
 +int isl_set_involves_dims(__isl_keep isl_set *set,
 +      enum isl_dim_type type, unsigned first, unsigned n)
 +{
 +      return isl_map_involves_dims(set, type, first, n);
 +}
 +
  /* Return true if the definition of the given div is unknown or depends
   * on unknown divs.
   */