1 files changed, 9 insertions, 9 deletions

diff --git a/polly/lib/CodeGen/IslNodeBuilder.cpp b/polly/lib/CodeGen/IslNodeBuilder.cpp
index 7b315fe408e..fa3420b4550 100644
--- a/polly/lib/CodeGen/IslNodeBuilder.cpp
+++ b/polly/lib/CodeGen/IslNodeBuilder.cpp
@@ -519,9 +519,9 @@ void IslNodeBuilder::createForVector(__isl_take isl_ast_node *For,
 /// @param Node The band node to be modified.
 /// @return The modified schedule node.
 static bool IsLoopVectorizerDisabled(isl::ast_node Node) {
-  assert(isl_ast_node_get_type(Node.keep()) == isl_ast_node_for);
+  assert(isl_ast_node_get_type(Node.get()) == isl_ast_node_for);
   auto Body = Node.for_get_body();
-  if (isl_ast_node_get_type(Body.keep()) != isl_ast_node_mark)
+  if (isl_ast_node_get_type(Body.get()) != isl_ast_node_mark)
     return false;
   auto Id = Body.mark_get_id();
   if (strcmp(Id.get_name().c_str(), "Loop Vectorizer Disabled") == 0)
@@ -757,13 +757,13 @@ static bool hasPartialAccesses(__isl_take isl_ast_node *Node) {
                if (isl_ast_node_get_type(Node) != isl_ast_node_user)
                  return isl_bool_true;
 
-               isl::ast_expr Expr = give(isl_ast_node_user_get_expr(Node));
-               isl::ast_expr StmtExpr =
-                   give(isl_ast_expr_get_op_arg(Expr.keep(), 0));
-               isl::id Id = give(isl_ast_expr_get_id(StmtExpr.keep()));
+               isl::ast_expr Expr =
+                   isl::manage(isl_ast_node_user_get_expr(Node));
+               isl::ast_expr StmtExpr = Expr.get_op_arg(0);
+               isl::id Id = StmtExpr.get_id();
 
                ScopStmt *Stmt =
-                   static_cast<ScopStmt *>(isl_id_get_user(Id.keep()));
+                   static_cast<ScopStmt *>(isl_id_get_user(Id.get()));
                isl::set StmtDom = Stmt->getDomain();
                for (auto *MA : *Stmt) {
                  if (MA->isLatestPartialAccess())
@@ -900,10 +900,10 @@ IslNodeBuilder::createNewAccesses(ScopStmt *Stmt,
 
     // isl cannot generate an index expression for access-nothing accesses.
     isl::set AccDomain =
-        give(isl_pw_multi_aff_domain(isl_pw_multi_aff_copy(PWAccRel)));
+        isl::manage(isl_pw_multi_aff_domain(isl_pw_multi_aff_copy(PWAccRel)));
     isl::set Context = S.getContext();
     AccDomain = AccDomain.intersect_params(Context);
-    if (isl_set_is_empty(AccDomain.keep()) == isl_bool_true) {
+    if (AccDomain.is_empty()) {
       isl_pw_multi_aff_free(PWAccRel);
       continue;
     }