[SCEV] Still (again) trying to fix buildbots

diff --git a/llvm/include/llvm/Analysis/ScalarEvolutionExpressions.h b/llvm/include/llvm/Analysis/ScalarEvolutionExpressions.h
index 0327dc1..0245569 100644 (file)
--- a/llvm/include/llvm/Analysis/ScalarEvolutionExpressions.h
+++ b/llvm/include/llvm/Analysis/ScalarEvolutionExpressions.h
@@ -86,7 +86,7 @@ class Type;
       assert(i == 0 && "Operand index out of range!");
       return Operands[0];
     }
-    using op_iterator = const SCEV *const *;
+    using op_iterator = std::array<const SCEV *, 1>::const_iterator;
     using op_range = iterator_range<op_iterator>;
 
     op_range operands() const {
@@ -274,7 +274,7 @@ class Type;
   class SCEVUDivExpr : public SCEV {
     friend class ScalarEvolution;
 
-    std::array<const SCEV*, 2> Operands;
+    std::array<const SCEV *, 2> Operands;
 
     SCEVUDivExpr(const FoldingSetNodeIDRef ID, const SCEV *lhs, const SCEV *rhs)
         : SCEV(ID, scUDivExpr, computeExpressionSize({lhs, rhs})) {
@@ -291,7 +291,7 @@ class Type;
       return i == 0 ? getLHS() : getRHS();
     }
 
-    using op_iterator = const SCEV *const *;
+    using op_iterator = std::array<const SCEV *, 2>::const_iterator;
     using op_range = iterator_range<op_iterator>;
     op_range operands() const {
       return make_range(Operands.begin(), Operands.end());