From 232fdad4f25ab63047aaf92d869b28f71eea8513 Mon Sep 17 00:00:00 2001 From: Tobias Grosser Date: Sun, 6 Aug 2017 20:19:26 +0000 Subject: [PATCH] [ScopInfo] Move Scop::addNonEmptyDomainConstraints to isl++ [NFC] llvm-svn: 310225 --- polly/include/polly/ScopInfo.h | 2 +- polly/lib/Analysis/ScopInfo.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/polly/include/polly/ScopInfo.h b/polly/include/polly/ScopInfo.h index 72d71fa..88d6b06 100644 --- a/polly/include/polly/ScopInfo.h +++ b/polly/include/polly/ScopInfo.h @@ -2028,7 +2028,7 @@ private: DenseMap &InvalidDomainMap); /// Add parameter constraints to @p C that imply a non-empty domain. - __isl_give isl_set *addNonEmptyDomainConstraints(__isl_take isl_set *C) const; + isl::set addNonEmptyDomainConstraints(isl::set C) const; /// Return the access for the base ptr of @p MA if any. MemoryAccess *lookupBasePtrAccess(MemoryAccess *MA); diff --git a/polly/lib/Analysis/ScopInfo.cpp b/polly/lib/Analysis/ScopInfo.cpp index 76d8440..8b6eb9b 100644 --- a/polly/lib/Analysis/ScopInfo.cpp +++ b/polly/lib/Analysis/ScopInfo.cpp @@ -2199,10 +2199,9 @@ isl::id Scop::getIdForParam(const SCEV *Parameter) const { return isl::manage(isl_id_copy(ParameterIds.lookup(Parameter))); } -__isl_give isl_set * -Scop::addNonEmptyDomainConstraints(__isl_take isl_set *C) const { +isl::set Scop::addNonEmptyDomainConstraints(isl::set C) const { isl_set *DomainContext = isl_union_set_params(getDomains()); - return isl_set_intersect_params(C, DomainContext); + return isl::manage(isl_set_intersect_params(C.release(), DomainContext)); } bool Scop::isDominatedBy(const DominatorTree &DT, BasicBlock *BB) const { @@ -4338,7 +4337,8 @@ bool Scop::isProfitable(bool ScalarsAreUnprofitable) const { bool Scop::hasFeasibleRuntimeContext() const { auto *PositiveContext = getAssumedContext(); auto *NegativeContext = getInvalidContext(); - PositiveContext = addNonEmptyDomainConstraints(PositiveContext); + PositiveContext = + addNonEmptyDomainConstraints(isl::manage(PositiveContext)).release(); bool IsFeasible = !(isl_set_is_empty(PositiveContext) || isl_set_is_subset(PositiveContext, NegativeContext)); isl_set_free(PositiveContext); -- 2.7.4