summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--polly/include/polly/ScopInfo.h6
-rw-r--r--polly/lib/Analysis/ScopInfo.cpp10
2 files changed, 8 insertions, 8 deletions
diff --git a/polly/include/polly/ScopInfo.h b/polly/include/polly/ScopInfo.h
index 0d1ca133fa7..1057509de1f 100644
--- a/polly/include/polly/ScopInfo.h
+++ b/polly/include/polly/ScopInfo.h
@@ -657,10 +657,10 @@ private:
void computeBoundsOnAccessRelation(unsigned ElementSize);
/// Get the original access function as read from IR.
- __isl_give isl_map *getOriginalAccessRelation() const;
+ isl::map getOriginalAccessRelation() const;
/// Return the space in which the access relation lives in.
- __isl_give isl_space *getOriginalAccessRelationSpace() const;
+ isl::space getOriginalAccessRelationSpace() const;
/// Get the new access function imported or set by a pass
__isl_give isl_map *getNewAccessRelation() const;
@@ -812,7 +812,7 @@ public:
///
__isl_give isl_map *getLatestAccessRelation() const {
return hasNewAccessRelation() ? getNewAccessRelation()
- : getOriginalAccessRelation();
+ : getOriginalAccessRelation().release();
}
/// Old name of getLatestAccessRelation().
diff --git a/polly/lib/Analysis/ScopInfo.cpp b/polly/lib/Analysis/ScopInfo.cpp
index c125c594506..7c1f8ef015b 100644
--- a/polly/lib/Analysis/ScopInfo.cpp
+++ b/polly/lib/Analysis/ScopInfo.cpp
@@ -687,16 +687,16 @@ __isl_give isl_pw_multi_aff *MemoryAccess::applyScheduleToAccessRelation(
return isl_pw_multi_aff_from_map(ScheduledAccRel);
}
-__isl_give isl_map *MemoryAccess::getOriginalAccessRelation() const {
- return AccessRelation.copy();
+isl::map MemoryAccess::getOriginalAccessRelation() const {
+ return AccessRelation;
}
std::string MemoryAccess::getOriginalAccessRelationStr() const {
return stringFromIslObj(AccessRelation.get());
}
-__isl_give isl_space *MemoryAccess::getOriginalAccessRelationSpace() const {
- return isl_map_get_space(AccessRelation.get());
+isl::space MemoryAccess::getOriginalAccessRelationSpace() const {
+ return AccessRelation.get_space();
}
__isl_give isl_map *MemoryAccess::getNewAccessRelation() const {
@@ -745,7 +745,7 @@ void MemoryAccess::assumeNoOutOfBound() {
if (PollyIgnoreInbounds)
return;
auto *SAI = getScopArrayInfo();
- isl::space Space = give(getOriginalAccessRelationSpace()).range();
+ isl::space Space = getOriginalAccessRelationSpace().range();
isl::set Outside = isl::set::empty(Space);
for (int i = 1, Size = Space.dim(isl::dim::set); i < Size; ++i) {
isl::local_space LS(Space);
OpenPOWER on IntegriCloud