add some memory management annotations

diff --git a/include/isl_constraint.h b/include/isl_constraint.h
index bff296f..a09c066 100644 (file)
--- a/include/isl_constraint.h
+++ b/include/isl_constraint.h
@@ -15,9 +15,10 @@ struct isl_constraint {
        struct isl_basic_map    *bmap;
        isl_int                 **line;
 };
+typedef struct isl_constraint isl_constraint;
 
-struct isl_constraint *isl_equality_alloc(struct isl_dim *dim);
-struct isl_constraint *isl_inequality_alloc(struct isl_dim *dim);
+__isl_give isl_constraint *isl_equality_alloc(__isl_take isl_dim *dim);
+__isl_give isl_constraint *isl_inequality_alloc(__isl_take isl_dim *dim);
 struct isl_constraint *isl_basic_set_constraint(struct isl_basic_set *bset,
        isl_int **line);
 
@@ -31,10 +32,10 @@ struct isl_constraint *isl_constraint_next(struct isl_constraint *c);
 int isl_constraint_is_equal(struct isl_constraint *constraint1,
                            struct isl_constraint *constraint2);
 
-struct isl_basic_map *isl_basic_map_add_constraint(
-       struct isl_basic_map *bmap, struct isl_constraint *constraint);
-struct isl_basic_set *isl_basic_set_add_constraint(
-       struct isl_basic_set *bset, struct isl_constraint *constraint);
+__isl_give isl_basic_map *isl_basic_map_add_constraint(
+       __isl_take isl_basic_map *bmap, __isl_take isl_constraint *constraint);
+__isl_give isl_basic_set *isl_basic_set_add_constraint(
+       __isl_take isl_basic_set *bset, __isl_take isl_constraint *constraint);
 
 int isl_basic_set_has_defining_equality(
        struct isl_basic_set *bset, enum isl_dim_type type, int pos,
@@ -50,8 +51,8 @@ int isl_constraint_dim(struct isl_constraint *constraint,
 void isl_constraint_get_constant(struct isl_constraint *constraint, isl_int *v);
 void isl_constraint_get_coefficient(struct isl_constraint *constraint,
        enum isl_dim_type type, int pos, isl_int *v);
-void isl_constraint_set_constant(struct isl_constraint *constraint, isl_int v);
-void isl_constraint_set_coefficient(struct isl_constraint *constraint,
+void isl_constraint_set_constant(__isl_keep isl_constraint *constraint, isl_int v);
+void isl_constraint_set_coefficient(__isl_keep isl_constraint *constraint,
        enum isl_dim_type type, int pos, isl_int v);
 
 struct isl_div *isl_constraint_div(struct isl_constraint *constraint, int pos);

diff --git a/include/isl_ctx.h b/include/isl_ctx.h
index fbf964c..0839d55 100644 (file)
--- a/include/isl_ctx.h
+++ b/include/isl_ctx.h
@@ -9,6 +9,10 @@
 #include <isl_hash.h>
 #include <isl_libs.h>
 
+#define __isl_give
+#define __isl_take
+#define __isl_keep
+
 #if defined(__cplusplus)
 extern "C" {
 #endif
@@ -75,6 +79,7 @@ struct isl_ctx {
        unsigned                gbr;
        unsigned                gbr_only_first;
 };
+typedef struct isl_ctx isl_ctx;
 
 /* Some helper macros */
 
@@ -111,10 +116,10 @@ struct isl_ctx {
 
 /* struct isl_ctx functions */
 
-struct isl_ctx *isl_ctx_alloc();
+isl_ctx *isl_ctx_alloc();
 void isl_ctx_ref(struct isl_ctx *ctx);
 void isl_ctx_deref(struct isl_ctx *ctx);
-void isl_ctx_free(struct isl_ctx *ctx);
+void isl_ctx_free(isl_ctx *ctx);
 
 #if defined(__cplusplus)
 }

diff --git a/include/isl_dim.h b/include/isl_dim.h
index d443a88..5e1f71f 100644 (file)
--- a/include/isl_dim.h
+++ b/include/isl_dim.h
@@ -20,6 +20,7 @@ struct isl_dim {
        unsigned n_name;
        struct isl_name **names;
 };
+typedef struct isl_dim isl_dim;
 
 enum isl_dim_type {
        isl_dim_param,
@@ -30,13 +31,13 @@ enum isl_dim_type {
        isl_dim_all,
 };
 
-struct isl_dim *isl_dim_alloc(struct isl_ctx *ctx,
+__isl_give isl_dim *isl_dim_alloc(isl_ctx *ctx,
                        unsigned nparam, unsigned n_in, unsigned n_out);
-struct isl_dim *isl_dim_set_alloc(struct isl_ctx *ctx,
+__isl_give isl_dim *isl_dim_set_alloc(isl_ctx *ctx,
                        unsigned nparam, unsigned dim);
-struct isl_dim *isl_dim_copy(struct isl_dim *dim);
+__isl_give isl_dim *isl_dim_copy(__isl_keep isl_dim *dim);
 struct isl_dim *isl_dim_cow(struct isl_dim *dim);
-void isl_dim_free(struct isl_dim *dim);
+void isl_dim_free(__isl_take isl_dim *dim);
 
 struct isl_dim *isl_dim_set_name(struct isl_dim *dim,
                                 enum isl_dim_type type, unsigned pos,
@@ -66,7 +67,7 @@ int isl_dim_equal(struct isl_dim *dim1, struct isl_dim *dim2);
 int isl_dim_match(struct isl_dim *dim1, enum isl_dim_type dim1_type,
                struct isl_dim *dim2, enum isl_dim_type dim2_type);
 int isl_dim_compatible(struct isl_dim *dim1, struct isl_dim *dim2);
-unsigned isl_dim_size(struct isl_dim *dim, enum isl_dim_type type);
+unsigned isl_dim_size(__isl_keep isl_dim *dim, enum isl_dim_type type);
 unsigned isl_dim_total(struct isl_dim *dim);
 
 #if defined(__cplusplus)

diff --git a/include/isl_map.h b/include/isl_map.h
index a785882..a107146 100644 (file)
--- a/include/isl_map.h
+++ b/include/isl_map.h
@@ -69,7 +69,9 @@ struct isl_basic_map {
        struct isl_blk block;
        struct isl_blk block2;
 };
+typedef struct isl_basic_map isl_basic_map;
 struct isl_basic_set;
+typedef struct isl_basic_set isl_basic_set;
 
 /* A "map" is a (disjoint) union of basic maps.
  *
@@ -92,7 +94,9 @@ struct isl_map {
        size_t size;
        struct isl_basic_map *p[1];
 };
+typedef struct isl_map isl_map;
 struct isl_set;
+typedef struct isl_set isl_set;
 
 unsigned isl_basic_map_n_in(const struct isl_basic_map *bmap);
 unsigned isl_basic_map_n_out(const struct isl_basic_map *bmap);
@@ -113,11 +117,11 @@ struct isl_dim *isl_map_get_dim(struct isl_map *map);
 struct isl_basic_map *isl_basic_map_alloc(struct isl_ctx *ctx,
                unsigned nparam, unsigned in, unsigned out, unsigned extra,
                unsigned n_eq, unsigned n_ineq);
-struct isl_basic_map *isl_basic_map_identity(struct isl_dim *set_dim);
+__isl_give isl_basic_map *isl_basic_map_identity(__isl_take isl_dim *set_dim);
 struct isl_basic_map *isl_basic_map_identity_like(struct isl_basic_map *model);
 struct isl_basic_map *isl_basic_map_finalize(struct isl_basic_map *bmap);
-void isl_basic_map_free(struct isl_basic_map *bmap);
-struct isl_basic_map *isl_basic_map_copy(struct isl_basic_map *bmap);
+void isl_basic_map_free(__isl_take isl_basic_map *bmap);
+__isl_give isl_basic_map *isl_basic_map_copy(__isl_keep isl_basic_map *bmap);
 struct isl_basic_map *isl_basic_map_extend(struct isl_basic_map *base,
                unsigned nparam, unsigned n_in, unsigned n_out, unsigned extra,
                unsigned n_eq, unsigned n_ineq);
@@ -127,33 +131,35 @@ struct isl_basic_map *isl_basic_map_equal(
                struct isl_dim *dim, unsigned n_equal);
 struct isl_basic_map *isl_basic_map_less_at(struct isl_dim *dim, unsigned pos);
 struct isl_basic_map *isl_basic_map_more_at(struct isl_dim *dim, unsigned pos);
-struct isl_basic_map *isl_basic_map_empty(struct isl_dim *dim);
+__isl_give isl_basic_map *isl_basic_map_empty(__isl_take isl_dim *dim);
 struct isl_basic_map *isl_basic_map_empty_like(struct isl_basic_map *model);
 struct isl_basic_map *isl_basic_map_empty_like_map(struct isl_map *model);
-struct isl_basic_map *isl_basic_map_universe(struct isl_dim *dim);
+__isl_give isl_basic_map *isl_basic_map_universe(__isl_take isl_dim *dim);
 struct isl_basic_map *isl_basic_map_convex_hull(struct isl_basic_map *bmap);
 
-struct isl_basic_map *isl_basic_map_intersect_domain(
-               struct isl_basic_map *bmap,
-               struct isl_basic_set *bset);
-struct isl_basic_map *isl_basic_map_intersect_range(
-               struct isl_basic_map *bmap,
-               struct isl_basic_set *bset);
-struct isl_basic_map *isl_basic_map_intersect(
-               struct isl_basic_map *bmap1,
-               struct isl_basic_map *bmap2);
-struct isl_map *isl_basic_map_union(
-               struct isl_basic_map *bmap1,
-               struct isl_basic_map *bmap2);
-struct isl_basic_map *isl_basic_map_apply_domain(
-               struct isl_basic_map *bmap1,
-               struct isl_basic_map *bmap2);
-struct isl_basic_map *isl_basic_map_apply_range(
-               struct isl_basic_map *bmap1,
-               struct isl_basic_map *bmap2);
+__isl_give isl_basic_map *isl_basic_map_intersect_domain(
+               __isl_take isl_basic_map *bmap,
+               __isl_take isl_basic_set *bset);
+__isl_give isl_basic_map *isl_basic_map_intersect_range(
+               __isl_take isl_basic_map *bmap,
+               __isl_take isl_basic_set *bset);
+__isl_give isl_basic_map *isl_basic_map_intersect(
+               __isl_take isl_basic_map *bmap1,
+               __isl_take isl_basic_map *bmap2);
+__isl_give isl_map *isl_basic_map_union(
+               __isl_take isl_basic_map *bmap1,
+               __isl_take isl_basic_map *bmap2);
+__isl_give isl_basic_map *isl_basic_map_apply_domain(
+               __isl_take isl_basic_map *bmap1,
+               __isl_take isl_basic_map *bmap2);
+__isl_give isl_basic_map *isl_basic_map_apply_range(
+               __isl_take isl_basic_map *bmap1,
+               __isl_take isl_basic_map *bmap2);
+__isl_give isl_basic_map *isl_basic_map_affine_hull(
+               __isl_take isl_basic_map *bmap);
 struct isl_basic_map *isl_basic_map_reverse(struct isl_basic_map *bmap);
-struct isl_basic_set *isl_basic_map_domain(struct isl_basic_map *bmap);
-struct isl_basic_set *isl_basic_map_range(struct isl_basic_map *bmap);
+__isl_give isl_basic_set *isl_basic_map_domain(__isl_take isl_basic_map *bmap);
+__isl_give isl_basic_set *isl_basic_map_range(__isl_take isl_basic_map *bmap);
 struct isl_basic_map *isl_basic_map_remove(struct isl_basic_map *bmap,
        enum isl_dim_type type, unsigned first, unsigned n);
 struct isl_basic_map *isl_basic_map_from_basic_set(struct isl_basic_set *bset,
@@ -164,7 +170,7 @@ struct isl_basic_map *isl_basic_map_detect_equalities(
                                                struct isl_basic_map *bmap);
 #define ISL_FORMAT_POLYLIB     1
 #define ISL_FORMAT_OMEGA       2
-struct isl_basic_map *isl_basic_map_read_from_file(struct isl_ctx *ctx,
+__isl_give isl_basic_map *isl_basic_map_read_from_file(isl_ctx *ctx,
                FILE *input, unsigned nparam, unsigned input_format);
 struct isl_basic_map *isl_basic_map_fix_si(struct isl_basic_map *bmap,
                enum isl_dim_type type, unsigned pos, int value);
@@ -180,16 +186,17 @@ struct isl_map *isl_map_neg(struct isl_map *map);
 struct isl_map *isl_map_floordiv(struct isl_map *map, isl_int d);
 
 int isl_basic_map_is_equal(
-               struct isl_basic_map *bmap1, struct isl_basic_map *bmap2);
+               __isl_keep isl_basic_map *bmap1,
+               __isl_keep isl_basic_map *bmap2);
 
-struct isl_map *isl_basic_map_partial_lexmax(
-               struct isl_basic_map *bmap, struct isl_basic_set *dom,
-               struct isl_set **empty);
-struct isl_map *isl_basic_map_partial_lexmin(
-               struct isl_basic_map *bmap, struct isl_basic_set *dom,
-               struct isl_set **empty);
+__isl_give isl_map *isl_basic_map_partial_lexmax(
+               __isl_take isl_basic_map *bmap, __isl_take isl_basic_set *dom,
+               __isl_give isl_set **empty);
+__isl_give isl_map *isl_basic_map_partial_lexmin(
+               __isl_take isl_basic_map *bmap, __isl_take isl_basic_set *dom,
+               __isl_give isl_set **empty);
 
-void isl_basic_map_dump(struct isl_basic_map *bmap, FILE *out, int indent);
+void isl_basic_map_dump(__isl_keep isl_basic_map *bmap, FILE *out, int indent);
 
 struct isl_basic_map *isl_map_copy_basic_map(struct isl_map *map);
 struct isl_map *isl_map_drop_basic_map(struct isl_map *map,
@@ -198,86 +205,92 @@ struct isl_map *isl_map_drop_basic_map(struct isl_map *map,
 int isl_basic_map_fast_is_fixed(struct isl_basic_map *bmap,
        enum isl_dim_type type, unsigned pos, isl_int *val);
 
-int isl_basic_map_is_universe(struct isl_basic_map *bmap);
-int isl_basic_map_fast_is_empty(struct isl_basic_map *bmap);
-int isl_basic_map_is_empty(struct isl_basic_map *bmap);
-int isl_basic_map_is_subset(struct isl_basic_map *bmap1,
-               struct isl_basic_map *bmap2);
-int isl_basic_map_is_strict_subset(struct isl_basic_map *bmap1,
-               struct isl_basic_map *bmap2);
+int isl_basic_map_is_universe(__isl_keep isl_basic_map *bmap);
+int isl_basic_map_fast_is_empty(__isl_keep isl_basic_map *bmap);
+int isl_basic_map_is_empty(__isl_keep isl_basic_map *bmap);
+int isl_basic_map_is_subset(__isl_keep isl_basic_map *bmap1,
+               __isl_keep isl_basic_map *bmap2);
+int isl_basic_map_is_strict_subset(__isl_keep isl_basic_map *bmap1,
+               __isl_keep isl_basic_map *bmap2);
 
 struct isl_map *isl_map_alloc(struct isl_ctx *ctx,
                unsigned nparam, unsigned in, unsigned out, int n,
                unsigned flags);
-struct isl_map *isl_map_universe(struct isl_dim *dim);
-struct isl_map *isl_map_empty(struct isl_dim *dim);
+__isl_give isl_map *isl_map_universe(__isl_take isl_dim *dim);
+__isl_give isl_map *isl_map_empty(__isl_take isl_dim *dim);
 struct isl_map *isl_map_empty_like(struct isl_map *model);
 struct isl_map *isl_map_empty_like_basic_map(struct isl_basic_map *model);
 struct isl_map *isl_map_dup(struct isl_map *map);
 struct isl_map *isl_map_add(struct isl_map *map, struct isl_basic_map *bmap);
-struct isl_map *isl_map_identity(struct isl_dim *set_dim);
+__isl_give isl_map *isl_map_identity(__isl_take isl_dim *set_dim);
 struct isl_map *isl_map_identity_like(struct isl_map *model);
 struct isl_map *isl_map_identity_like_basic_map(struct isl_basic_map *model);
 struct isl_map *isl_map_finalize(struct isl_map *map);
-void isl_map_free(struct isl_map *map);
-struct isl_map *isl_map_copy(struct isl_map *map);
+void isl_map_free(__isl_take isl_map *map);
+__isl_give isl_map *isl_map_copy(__isl_keep isl_map *map);
 struct isl_map *isl_map_extend(struct isl_map *base,
                unsigned nparam, unsigned n_in, unsigned n_out);
 struct isl_map *isl_map_reverse(struct isl_map *map);
-struct isl_map *isl_map_union(struct isl_map *map1, struct isl_map *map2);
+__isl_give isl_map *isl_map_union(
+               __isl_take isl_map *map1,
+               __isl_take isl_map *map2);
 struct isl_map *isl_map_union_disjoint(
                        struct isl_map *map1, struct isl_map *map2);
-struct isl_map *isl_map_intersect_domain(
-               struct isl_map *map,
-               struct isl_set *set);
-struct isl_map *isl_map_intersect_range(
-               struct isl_map *map,
-               struct isl_set *set);
-struct isl_map *isl_map_apply_domain(
-               struct isl_map *map1,
-               struct isl_map *map2);
-struct isl_map *isl_map_apply_range(
-               struct isl_map *map1,
-               struct isl_map *map2);
+__isl_give isl_map *isl_map_intersect_domain(
+               __isl_take isl_map *map,
+               __isl_take isl_set *set);
+__isl_give isl_map *isl_map_intersect_range(
+               __isl_take isl_map *map,
+               __isl_take isl_set *set);
+__isl_give isl_map *isl_map_apply_domain(
+               __isl_take isl_map *map1,
+               __isl_take isl_map *map2);
+__isl_give isl_map *isl_map_apply_range(
+               __isl_take isl_map *map1,
+               __isl_take isl_map *map2);
 struct isl_map *isl_map_product(struct isl_map *map1, struct isl_map *map2);
-struct isl_map *isl_map_intersect(struct isl_map *map1, struct isl_map *map2);
-struct isl_map *isl_map_subtract(struct isl_map *map1, struct isl_map *map2);
+__isl_give isl_map *isl_map_intersect(__isl_take isl_map *map1,
+                                     __isl_take isl_map *map2);
+__isl_give isl_map *isl_map_subtract(
+               __isl_take isl_map *map1,
+               __isl_take isl_map *map2);
 struct isl_map *isl_map_fix_input_si(struct isl_map *map,
                unsigned input, int value);
 struct isl_map *isl_map_fix_si(struct isl_map *map,
                enum isl_dim_type type, unsigned pos, int value);
 struct isl_basic_set *isl_basic_map_deltas(struct isl_basic_map *bmap);
 struct isl_set *isl_map_deltas(struct isl_map *map);
-struct isl_set *isl_map_range(struct isl_map *map);
 struct isl_map *isl_map_detect_equalities(struct isl_map *map);
-struct isl_basic_map *isl_map_affine_hull(struct isl_map *map);
+__isl_give isl_basic_map *isl_map_affine_hull(__isl_take isl_map *map);
+__isl_give isl_basic_map *isl_map_convex_hull(__isl_take isl_map *map);
 struct isl_map *isl_map_remove(struct isl_map *map,
        enum isl_dim_type type, unsigned first, unsigned n);
 struct isl_map *isl_map_remove_inputs(struct isl_map *map,
        unsigned first, unsigned n);
 
-struct isl_set *isl_map_domain(struct isl_map *bmap);
-struct isl_map *isl_map_from_basic_map(struct isl_basic_map *bmap);
+__isl_give isl_set *isl_map_domain(__isl_take isl_map *bmap);
+__isl_give isl_set *isl_map_range(__isl_take isl_map *map);
+__isl_give isl_map *isl_map_from_basic_map(__isl_take isl_basic_map *bmap);
 struct isl_map *isl_map_from_range(struct isl_set *set);
 struct isl_map *isl_map_from_set(struct isl_set *set, struct isl_dim *dim);
 struct isl_set *isl_set_from_map(struct isl_map *map);
 
-int isl_map_fast_is_empty(struct isl_map *map);
-int isl_map_is_empty(struct isl_map *map);
-int isl_map_is_subset(struct isl_map *map1, struct isl_map *map2);
-int isl_map_is_strict_subset(struct isl_map *map1, struct isl_map *map2);
-int isl_map_is_equal(struct isl_map *map1, struct isl_map *map2);
+int isl_map_fast_is_empty(__isl_keep isl_map *map);
+int isl_map_is_empty(__isl_keep isl_map *map);
+int isl_map_is_subset(__isl_keep isl_map *map1, __isl_keep isl_map *map2);
+int isl_map_is_strict_subset(__isl_keep isl_map *map1, __isl_keep isl_map *map2);
+int isl_map_is_equal(__isl_keep isl_map *map1, __isl_keep isl_map *map2);
 
-void isl_map_dump(struct isl_map *map, FILE *out, int indent);
+void isl_map_dump(__isl_keep isl_map *map, FILE *out, int indent);
 
 int isl_map_fast_input_is_fixed(struct isl_map *map,
                unsigned in, isl_int *val);
 int isl_map_fast_is_fixed(struct isl_map *map,
        enum isl_dim_type type, unsigned pos, isl_int *val);
 
-struct isl_map *isl_map_coalesce(struct isl_map *map);
+__isl_give isl_map *isl_map_coalesce(__isl_take isl_map *map);
 
-int isl_map_fast_is_equal(struct isl_map *map1, struct isl_map *map2);
+int isl_map_fast_is_equal(__isl_keep isl_map *map1, __isl_keep isl_map *map2);
 
 #if defined(__cplusplus)
 }

diff --git a/include/isl_map_polylib.h b/include/isl_map_polylib.h
index f00a7c6..91382e4 100644 (file)
--- a/include/isl_map_polylib.h
+++ b/include/isl_map_polylib.h
@@ -9,11 +9,12 @@
 extern "C" {
 #endif
 
-struct isl_basic_map *isl_basic_map_new_from_polylib(Polyhedron *P,
-                       struct isl_dim *dim);
-struct isl_map *isl_map_new_from_polylib(Polyhedron *D, struct isl_dim *dim);
-Polyhedron *isl_basic_map_to_polylib(struct isl_basic_map *bmap);
-Polyhedron *isl_map_to_polylib(struct isl_map *map);
+__isl_give isl_basic_map *isl_basic_map_new_from_polylib(Polyhedron *P,
+                       __isl_take isl_dim *dim);
+__isl_give isl_map *isl_map_new_from_polylib(Polyhedron *D,
+                       __isl_take isl_dim *dim);
+Polyhedron *isl_basic_map_to_polylib(__isl_keep isl_basic_map *bmap);
+Polyhedron *isl_map_to_polylib(__isl_keep isl_map *map);
 
 #if defined(__cplusplus)
 }

diff --git a/include/isl_set.h b/include/isl_set.h
index 9cb63df..44ba91e 100644 (file)
--- a/include/isl_set.h
+++ b/include/isl_set.h
@@ -87,42 +87,43 @@ struct isl_basic_set *isl_basic_set_extend(struct isl_basic_set *base,
 struct isl_basic_set *isl_basic_set_extend_constraints(
                struct isl_basic_set *base, unsigned n_eq, unsigned n_ineq);
 struct isl_basic_set *isl_basic_set_finalize(struct isl_basic_set *bset);
-void isl_basic_set_free(struct isl_basic_set *bset);
-struct isl_basic_set *isl_basic_set_copy(struct isl_basic_set *bset);
+void isl_basic_set_free(__isl_take isl_basic_set *bset);
+__isl_give isl_basic_set *isl_basic_set_copy(__isl_keep isl_basic_set *bset);
 struct isl_basic_set *isl_basic_set_dup(struct isl_basic_set *bset);
-struct isl_basic_set *isl_basic_set_empty(struct isl_dim *dim);
+__isl_give isl_basic_set *isl_basic_set_empty(__isl_take isl_dim *dim);
 struct isl_basic_set *isl_basic_set_empty_like(struct isl_basic_set *bset);
-struct isl_basic_set *isl_basic_set_universe(struct isl_dim *dim);
+__isl_give isl_basic_set *isl_basic_set_universe(__isl_take isl_dim *dim);
 struct isl_basic_set *isl_basic_set_universe_like(struct isl_basic_set *bset);
 struct isl_basic_set *isl_basic_set_interval(struct isl_ctx *ctx,
        isl_int min, isl_int max);
 struct isl_basic_set *isl_basic_set_positive_orthant(struct isl_dim *dims);
-void isl_basic_set_dump(struct isl_basic_set *bset,
+void isl_basic_set_dump(__isl_keep isl_basic_set *bset,
                                FILE *out, int indent);
 struct isl_basic_set *isl_basic_set_swap_vars(
                struct isl_basic_set *bset, unsigned n);
-struct isl_basic_set *isl_basic_set_intersect(
-               struct isl_basic_set *bset1,
-               struct isl_basic_set *bset2);
-struct isl_basic_set *isl_basic_set_apply(
-               struct isl_basic_set *bset,
-               struct isl_basic_map *bmap);
-struct isl_basic_set *isl_basic_set_affine_hull(struct isl_basic_set *bset);
+__isl_give isl_basic_set *isl_basic_set_intersect(
+               __isl_take isl_basic_set *bset1,
+               __isl_take isl_basic_set *bset2);
+__isl_give isl_basic_set *isl_basic_set_apply(
+               __isl_take isl_basic_set *bset,
+               __isl_take isl_basic_map *bmap);
+__isl_give isl_basic_set *isl_basic_set_affine_hull(
+               __isl_take isl_basic_set *bset);
 struct isl_basic_set *isl_basic_set_simplify(struct isl_basic_set *bset);
 struct isl_basic_set *isl_basic_set_product(struct isl_basic_set_list *list);
 
 #define ISL_FORMAT_POLYLIB             1
 #define ISL_FORMAT_OMEGA               2
-struct isl_basic_set *isl_basic_set_read_from_file(struct isl_ctx *ctx,
+__isl_give isl_basic_set *isl_basic_set_read_from_file(isl_ctx *ctx,
                FILE *input, unsigned nparam, unsigned input_format);
-struct isl_basic_set *isl_basic_set_read_from_str(struct isl_ctx *ctx,
+__isl_give isl_basic_set *isl_basic_set_read_from_str(isl_ctx *ctx,
                const char *str, unsigned nparam, unsigned input_format);
-struct isl_set *isl_set_read_from_file(struct isl_ctx *ctx,
+__isl_give isl_set *isl_set_read_from_file(isl_ctx *ctx,
                FILE *input, unsigned nparam, unsigned input_format);
 #define ISL_FORMAT_POLYLIB_CONSTRAINTS 3
-void isl_basic_set_print(struct isl_basic_set *bset, FILE *out, int indent,
+void isl_basic_set_print(__isl_keep isl_basic_set *bset, FILE *out, int indent,
        const char *prefix, const char *suffix, unsigned output_format);
-void isl_set_print(struct isl_set *set, FILE *out, int indent,
+void isl_set_print(__isl_keep struct isl_set *set, FILE *out, int indent,
        unsigned output_format);
 struct isl_basic_set *isl_basic_set_fix_si(struct isl_basic_set *bset,
                enum isl_dim_type type, unsigned pos, int value);
@@ -136,54 +137,63 @@ struct isl_set *isl_set_to_underlying_set(struct isl_set *set);
 int isl_basic_set_is_equal(
                struct isl_basic_set *bset1, struct isl_basic_set *bset2);
 
-struct isl_set *isl_basic_set_partial_lexmin(
-               struct isl_basic_set *bset, struct isl_basic_set *dom,
-               struct isl_set **empty);
-struct isl_set *isl_basic_set_partial_lexmax(
-               struct isl_basic_set *bset, struct isl_basic_set *dom,
-               struct isl_set **empty);
-struct isl_set *isl_basic_set_lexmin(struct isl_basic_set *bset);
-struct isl_set *isl_basic_set_union(
-               struct isl_basic_set *bset1,
-               struct isl_basic_set *bset2);
+__isl_give isl_set *isl_basic_set_partial_lexmin(
+               __isl_take isl_basic_set *bset, __isl_take isl_basic_set *dom,
+               __isl_give isl_set **empty);
+__isl_give isl_set *isl_basic_set_partial_lexmax(
+               __isl_take isl_basic_set *bset, __isl_take isl_basic_set *dom,
+               __isl_give isl_set **empty);
+__isl_give isl_set *isl_basic_set_lexmin(__isl_take isl_basic_set *bset);
+__isl_give isl_set *isl_basic_set_union(
+               __isl_take isl_basic_set *bset1,
+               __isl_take isl_basic_set *bset2);
 
 int isl_basic_set_compare_at(struct isl_basic_set *bset1,
        struct isl_basic_set *bset2, int pos);
 
-int isl_basic_set_is_universe(struct isl_basic_set *bset);
-int isl_basic_set_fast_is_empty(struct isl_basic_set *bset);
-int isl_basic_set_is_empty(struct isl_basic_set *bset);
+int isl_basic_set_is_universe(__isl_keep isl_basic_set *bset);
+int isl_basic_set_fast_is_empty(__isl_keep isl_basic_set *bset);
+int isl_basic_set_is_empty(__isl_keep isl_basic_set *bset);
 
 struct isl_set *isl_set_alloc(struct isl_ctx *ctx,
                unsigned nparam, unsigned dim, int n, unsigned flags);
 struct isl_set *isl_set_extend(struct isl_set *base,
                unsigned nparam, unsigned dim);
-struct isl_set *isl_set_empty(struct isl_dim *dim);
+__isl_give isl_set *isl_set_empty(__isl_take isl_dim *dim);
 struct isl_set *isl_set_empty_like(struct isl_set *set);
-struct isl_set *isl_set_universe(struct isl_dim *dim);
+__isl_give isl_set *isl_set_universe(__isl_take isl_dim *dim);
 struct isl_set *isl_set_add(struct isl_set *set, struct isl_basic_set *bset);
 struct isl_set *isl_set_finalize(struct isl_set *set);
-struct isl_set *isl_set_copy(struct isl_set *set);
-void isl_set_free(struct isl_set *set);
+__isl_give isl_set *isl_set_copy(__isl_keep isl_set *set);
+void isl_set_free(__isl_take isl_set *set);
 struct isl_set *isl_set_dup(struct isl_set *set);
-struct isl_set *isl_set_from_basic_set(struct isl_basic_set *bset);
-struct isl_basic_set *isl_set_affine_hull(struct isl_set *set);
-struct isl_basic_set *isl_set_convex_hull(struct isl_set *set);
+__isl_give isl_set *isl_set_from_basic_set(__isl_take isl_basic_set *bset);
+__isl_give isl_basic_set *isl_set_affine_hull(__isl_take isl_set *set);
+__isl_give isl_basic_set *isl_set_convex_hull(__isl_take isl_set *set);
 struct isl_basic_set *isl_set_simple_hull(struct isl_set *set);
 struct isl_basic_set *isl_set_bounded_simple_hull(struct isl_set *set);
 
 struct isl_set *isl_set_union_disjoint(
                        struct isl_set *set1, struct isl_set *set2);
-struct isl_set *isl_set_union(struct isl_set *set1, struct isl_set *set2);
+__isl_give isl_set *isl_set_union(
+               __isl_take isl_set *set1,
+               __isl_take isl_set *set2);
 struct isl_set *isl_set_product(struct isl_set *set1, struct isl_set *set2);
-struct isl_set *isl_set_intersect(struct isl_set *set1, struct isl_set *set2);
-struct isl_set *isl_set_subtract(struct isl_set *set1, struct isl_set *set2);
-struct isl_set *isl_set_apply(struct isl_set *set, struct isl_map *map);
+__isl_give isl_set *isl_set_intersect(
+               __isl_take isl_set *set1,
+               __isl_take isl_set *set2);
+__isl_give isl_set *isl_set_subtract(
+               __isl_take isl_set *set1,
+               __isl_take isl_set *set2);
+__isl_give isl_set *isl_set_apply(
+               __isl_take isl_set *set,
+               __isl_take isl_map *map);
 struct isl_set *isl_set_fix_dim_si(struct isl_set *set,
                unsigned dim, int value);
 struct isl_set *isl_set_lower_bound_dim(struct isl_set *set,
                unsigned dim, isl_int value);
-struct isl_basic_set *isl_basic_set_project_out(struct isl_basic_set *bset,
+__isl_give isl_basic_set *isl_basic_set_project_out(
+               __isl_take isl_basic_set *bset,
                enum isl_dim_type type, unsigned first, unsigned n);
 struct isl_basic_set *isl_basic_set_remove_dims(struct isl_basic_set *bset,
                unsigned first, unsigned n);
@@ -194,11 +204,11 @@ struct isl_set *isl_set_remove_dims(struct isl_set *set,
                unsigned first, unsigned n);
 struct isl_set *isl_set_remove_divs(struct isl_set *set);
 
-void isl_set_dump(struct isl_set *set, FILE *out, int indent);
+void isl_set_dump(__isl_keep isl_set *set, FILE *out, int indent);
 struct isl_set *isl_set_swap_vars(struct isl_set *set, unsigned n);
-int isl_set_is_empty(struct isl_set *set);
-int isl_set_is_subset(struct isl_set *set1, struct isl_set *set2);
-int isl_set_is_equal(struct isl_set *set1, struct isl_set *set2);
+int isl_set_is_empty(__isl_keep isl_set *set);
+int isl_set_is_subset(__isl_keep isl_set *set1, __isl_keep isl_set *set2);
+int isl_set_is_equal(__isl_keep isl_set *set1, __isl_keep isl_set *set2);
 
 struct isl_set *isl_basic_set_compute_divs(struct isl_basic_set *bset);
 struct isl_set *isl_set_compute_divs(struct isl_set *set);
@@ -221,10 +231,10 @@ struct isl_set *isl_set_gist(struct isl_set *set,
 int isl_basic_set_dim_residue_class(struct isl_basic_set *bset,
        int pos, isl_int *modulo, isl_int *residue);
 
-struct isl_set *isl_set_coalesce(struct isl_set *set);
+__isl_give isl_set *isl_set_coalesce(__isl_take isl_set *set);
 
-int isl_set_fast_is_equal(struct isl_set *set1, struct isl_set *set2);
-int isl_set_fast_is_disjoint(struct isl_set *set1, struct isl_set *set2);
+int isl_set_fast_is_equal(__isl_keep isl_set *set1, __isl_keep isl_set *set2);
+int isl_set_fast_is_disjoint(__isl_keep isl_set *set1, __isl_keep isl_set *set2);
 
 uint32_t isl_set_get_hash(struct isl_set *set);
 

diff --git a/include/isl_set_polylib.h b/include/isl_set_polylib.h
index 2bf2201..1408df1 100644 (file)
--- a/include/isl_set_polylib.h
+++ b/include/isl_set_polylib.h
@@ -8,12 +8,13 @@
 extern "C" {
 #endif
 
-struct isl_basic_set *isl_basic_set_new_from_polylib(Polyhedron *P,
-                       struct isl_dim *dim);
-Polyhedron *isl_basic_set_to_polylib(struct isl_basic_set *bset);
+__isl_give isl_basic_set *isl_basic_set_new_from_polylib(Polyhedron *P,
+                       __isl_take isl_dim *dim);
+Polyhedron *isl_basic_set_to_polylib(__isl_keep isl_basic_set *bset);
 
-struct isl_set *isl_set_new_from_polylib(Polyhedron *D, struct isl_dim *dim);
-Polyhedron *isl_set_to_polylib(struct isl_set *set);
+__isl_give isl_set *isl_set_new_from_polylib(Polyhedron *D,
+                       __isl_take isl_dim *dim);
+Polyhedron *isl_set_to_polylib(__isl_keep isl_set *set);
 
 #if defined(__cplusplus)
 }