diff --git a/polly/include/polly/CodeGen/IslNodeBuilder.h b/polly/include/polly/CodeGen/IslNodeBuilder.h index 81343af94b63..03c47155894e 100644 --- a/polly/include/polly/CodeGen/IslNodeBuilder.h +++ b/polly/include/polly/CodeGen/IslNodeBuilder.h @@ -112,7 +112,7 @@ public: BlockGenerator &getBlockGenerator() { return BlockGen; } /// Return the parallel subfunctions that have been created. - const ArrayRef getParallelSubfunctions() const { + ArrayRef getParallelSubfunctions() const { return ParallelSubfunctions; } diff --git a/polly/include/polly/ScopInfo.h b/polly/include/polly/ScopInfo.h index ab0f81dd2836..f700144165d5 100644 --- a/polly/include/polly/ScopInfo.h +++ b/polly/include/polly/ScopInfo.h @@ -855,10 +855,10 @@ public: } /// Return a string representation of the access's reduction type. - const std::string getReductionOperatorStr() const; + std::string getReductionOperatorStr() const; /// Return a string representation of the reduction type @p RT. - static const std::string getReductionOperatorStr(ReductionType RT); + static std::string getReductionOperatorStr(ReductionType RT); /// Return the element type of the accessed array wrt. this access. Type *getElementType() const { return ElementType; } diff --git a/polly/lib/Analysis/ScopInfo.cpp b/polly/lib/Analysis/ScopInfo.cpp index ab9330581eb5..8c6a2360a249 100644 --- a/polly/lib/Analysis/ScopInfo.cpp +++ b/polly/lib/Analysis/ScopInfo.cpp @@ -527,7 +527,7 @@ void MemoryAccess::updateDimensionality() { } } -const std::string +std::string MemoryAccess::getReductionOperatorStr(MemoryAccess::ReductionType RT) { switch (RT) { case MemoryAccess::RT_NONE: @@ -910,7 +910,7 @@ void MemoryAccess::realignParams() { AccessRelation = AccessRelation.align_params(CtxSpace); } -const std::string MemoryAccess::getReductionOperatorStr() const { +std::string MemoryAccess::getReductionOperatorStr() const { return MemoryAccess::getReductionOperatorStr(getReductionType()); } diff --git a/polly/lib/CodeGen/IslAst.cpp b/polly/lib/CodeGen/IslAst.cpp index 142a19d5e069..09bacda19674 100644 --- a/polly/lib/CodeGen/IslAst.cpp +++ b/polly/lib/CodeGen/IslAst.cpp @@ -134,7 +134,7 @@ static isl_printer *printLine(__isl_take isl_printer *Printer, } /// Return all broken reductions as a string of clauses (OpenMP style). -static const std::string getBrokenReductionsStr(const isl::ast_node &Node) { +static std::string getBrokenReductionsStr(const isl::ast_node &Node) { IslAstInfo::MemoryAccessSet *BrokenReductions; std::string str;