1 files changed, 18 insertions, 16 deletions

diff --git a/polly/lib/External/isl/isl_pw_morph_templ.c b/polly/lib/External/isl/isl_pw_morph_templ.c
index a90fea12168f..3c08698a9a98 100644
--- a/polly/lib/External/isl/isl_pw_morph_templ.c
+++ b/polly/lib/External/isl/isl_pw_morph_templ.c
@@ -12,31 +12,33 @@ __isl_give PW *FN(PW,morph_domain)(__isl_take PW *pw,
 	__isl_take isl_morph *morph)
 {
 	int i;
+	isl_size n;
 	isl_ctx *ctx;
+	isl_space *space;
 
-	if (!pw || !morph)
+	n = FN(PW,n_piece)(pw);
+	if (n < 0 || !morph)
 		goto error;
 
 	ctx = isl_space_get_ctx(pw->dim);
 	isl_assert(ctx, isl_space_is_domain_internal(morph->dom->dim, pw->dim),
 		goto error);
 
-	pw = FN(PW,cow)(pw);
-	if (!pw)
-		goto error;
-	pw->dim = isl_space_extend_domain_with_range(
-			isl_space_copy(morph->ran->dim), pw->dim);
-	if (!pw->dim)
-		goto error;
+	space = FN(PW,take_space)(pw);
+	space = isl_space_extend_domain_with_range(
+			isl_space_copy(morph->ran->dim), space);
+	pw = FN(PW,restore_space)(pw, space);
+
+	for (i = 0; i < n; ++i) {
+		isl_set *domain;
+		EL *el;
 
-	for (i = 0; i < pw->n; ++i) {
-		pw->p[i].set = isl_morph_set(isl_morph_copy(morph), pw->p[i].set);
-		if (!pw->p[i].set)
-			goto error;
-		pw->p[i].FIELD = FN(EL,morph_domain)(pw->p[i].FIELD,
-						isl_morph_copy(morph));
-		if (!pw->p[i].FIELD)
-			goto error;
+		domain = FN(PW,take_domain_at)(pw, i);
+		domain = isl_morph_set(isl_morph_copy(morph), domain);
+		pw = FN(PW,restore_domain_at)(pw, i, domain);
+		el = FN(PW,take_base_at)(pw, i);
+		el = FN(EL,morph_domain)(el, isl_morph_copy(morph));
+		pw = FN(PW,restore_base_at)(pw, i, el);
 	}
 
 	isl_morph_free(morph);