Merge branch 'maint'

diff --cc isl_dim.c
index cb8ecff,b850384..6dc6ad0
--- 1/isl_dim.c
--- 2/isl_dim.c
+++ b/isl_dim.c
@@@ -465,16 -391,19 +465,19 @@@ static __isl_keep isl_dim *nested(__isl
  int isl_dim_tuple_match(__isl_keep isl_dim *dim1, enum isl_dim_type dim1_type,
                        __isl_keep isl_dim *dim2, enum isl_dim_type dim2_type)
  {
 -      struct isl_name *name1, *name2;
 +      isl_id *id1, *id2;
        isl_dim *nested1, *nested2;
  
+       if (!dim1 || !dim2)
+               return -1;
+ 
        if (n(dim1, dim1_type) != n(dim2, dim2_type))
                return 0;
 -      name1 = tuple_name(dim1, dim1_type);
 -      name2 = tuple_name(dim2, dim2_type);
 -      if (!name1 ^ !name2)
 +      id1 = tuple_id(dim1, dim1_type);
 +      id2 = tuple_id(dim2, dim2_type);
 +      if (!id1 ^ !id2)
                return 0;
 -      if (name1 && name1->name != name2->name)
 +      if (id1 && id1 != id2)
                return 0;
        nested1 = nested(dim1, dim1_type);
        nested2 = nested(dim2, dim2_type);

diff --cc isl_map_subtract.c
Simple merge

diff --cc isl_test.c
Simple merge