[polly] r280343 - [ScopInfo] Add missing ISL annotations NFC.

[Michael Kruse via llvm-commits]

Author: meinersbur
Date: Thu Sep  1 04:03:27 2016
New Revision: 280343

URL: http://llvm.org/viewvc/llvm-project?rev=280343&view=rev
Log:
[ScopInfo] Add missing ISL annotations NFC.

Modified:
    polly/trunk/include/polly/ScopInfo.h
    polly/trunk/lib/Analysis/ScopInfo.cpp

Modified: polly/trunk/include/polly/ScopInfo.h
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/include/polly/ScopInfo.h?rev=280343&r1=280342&r2=280343&view=diff
==============================================================================
--- polly/trunk/include/polly/ScopInfo.h (original)
+++ polly/trunk/include/polly/ScopInfo.h Thu Sep  1 04:03:27 2016
@@ -1580,10 +1580,9 @@ private:
   /// @param LI     The LoopInfo for the current function.
   ///
   /// @returns The domain under which @p BB is executed.
-  __isl_give isl_set *getPredecessorDomainConstraints(BasicBlock *BB,
-                                                      isl_set *Domain,
-                                                      DominatorTree &DT,
-                                                      LoopInfo &LI);
+  __isl_give isl_set *
+  getPredecessorDomainConstraints(BasicBlock *BB, __isl_keep isl_set *Domain,
+                                  DominatorTree &DT, LoopInfo &LI);
 
   /// @brief Add loop carried constraints to the header block of the loop @p L.
   ///
@@ -1888,7 +1887,7 @@ public:
   /// @param Parameter A SCEV that was recognized as a Parameter.
   ///
   /// @return The corresponding isl_id or NULL otherwise.
-  isl_id *getIdForParam(const SCEV *Parameter);
+  __isl_give isl_id *getIdForParam(const SCEV *Parameter);
 
   /// @brief Get the maximum region of this static control part.
   ///
@@ -2186,7 +2185,7 @@ public:
     ScopArrayInfoMap.erase(It);
   }
 
-  void setContext(isl_set *NewContext);
+  void setContext(__isl_take isl_set *NewContext);
 
   /// @brief Align the parameters in the statement to the scop context
   void realignParams();

Modified: polly/trunk/lib/Analysis/ScopInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Analysis/ScopInfo.cpp?rev=280343&r1=280342&r2=280343&view=diff
==============================================================================
--- polly/trunk/lib/Analysis/ScopInfo.cpp (original)
+++ polly/trunk/lib/Analysis/ScopInfo.cpp Thu Sep  1 04:03:27 2016
@@ -289,7 +289,7 @@ ScopArrayInfo::getFromAccessFunction(__i
   return getFromId(Id);
 }
 
-const ScopArrayInfo *ScopArrayInfo::getFromId(isl_id *Id) {
+const ScopArrayInfo *ScopArrayInfo::getFromId(__isl_take isl_id *Id) {
   void *User = isl_id_get_user(Id);
   const ScopArrayInfo *SAI = static_cast<ScopArrayInfo *>(User);
   isl_id_free(Id);
@@ -954,15 +954,15 @@ bool MemoryAccess::isStrideX(__isl_take
   return IsStrideX;
 }
 
-bool MemoryAccess::isStrideZero(const isl_map *Schedule) const {
+bool MemoryAccess::isStrideZero(__isl_take const isl_map *Schedule) const {
   return isStrideX(Schedule, 0);
 }
 
-bool MemoryAccess::isStrideOne(const isl_map *Schedule) const {
+bool MemoryAccess::isStrideOne(__isl_take const isl_map *Schedule) const {
   return isStrideX(Schedule, 1);
 }
 
-void MemoryAccess::setNewAccessRelation(isl_map *NewAccess) {
+void MemoryAccess::setNewAccessRelation(__isl_take isl_map *NewAccess) {
   isl_map_free(NewAccessRelation);
   NewAccessRelation = NewAccess;
 }
@@ -1806,7 +1806,8 @@ __isl_give isl_id *Scop::getIdForParam(c
   return isl_id_copy(ParameterIds.lookup(Parameter));
 }
 
-__isl_give isl_set *Scop::addNonEmptyDomainConstraints(isl_set *C) const {
+__isl_give isl_set *
+Scop::addNonEmptyDomainConstraints(__isl_take isl_set *C) const {
   isl_set *DomainContext = isl_union_set_params(getDomains());
   return isl_set_intersect_params(C, DomainContext);
 }
@@ -2580,10 +2581,10 @@ bool Scop::buildDomainsWithBranchConstra
   return true;
 }
 
-__isl_give isl_set *Scop::getPredecessorDomainConstraints(BasicBlock *BB,
-                                                          isl_set *Domain,
-                                                          DominatorTree &DT,
-                                                          LoopInfo &LI) {
+__isl_give isl_set *
+Scop::getPredecessorDomainConstraints(BasicBlock *BB,
+                                      __isl_keep isl_set *Domain,
+                                      DominatorTree &DT, LoopInfo &LI) {
   // If @p BB is the ScopEntry we are done
   if (R.getEntry() == BB)
     return isl_set_universe(isl_set_get_space(Domain));