Put back makeArrayRef to make GCC 5 happy

d0k · d0k · commit 7355364f63ea · 2020-02-08T16:15:09.000+01:00
diff --git a/mlir/include/mlir/Dialect/Utils/StructuredOpsUtils.h b/mlir/include/mlir/Dialect/Utils/StructuredOpsUtils.h
@@ -64,7 +64,7 @@ inline ArrayRef<StringRef> getAllIteratorTypeNames() {
   static constexpr StringRef names[3] = {getParallelIteratorTypeName(),
                                          getReductionIteratorTypeName(),
                                          getWindowIteratorTypeName()};
-  return names;
+  return llvm::makeArrayRef(names);
 }
 
 /// Returns the iterator of a certain type.
diff --git a/mlir/lib/Dialect/VectorOps/VectorOps.cpp b/mlir/lib/Dialect/VectorOps/VectorOps.cpp
@@ -280,7 +280,7 @@ static LogicalResult verify(ContractionOp op) {
 ArrayRef<StringRef> ContractionOp::getTraitAttrNames() {
   static constexpr StringRef names[2] = {getIndexingMapsAttrName(),
                                          getIteratorTypesAttrName()};
-  return names;
+  return llvm::makeArrayRef(names);
 }
 
 static int64_t getResultIndex(AffineMap map, AffineExpr targetExpr) {

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ inline ArrayRef<StringRef> getAllIteratorTypeNames() {`
`64`	`64`	`static constexpr StringRef names[3] = {getParallelIteratorTypeName(),`
`65`	`65`	`getReductionIteratorTypeName(),`
`66`	`66`	`getWindowIteratorTypeName()};`
`67`		`- return names;`
	`67`	`+ return llvm::makeArrayRef(names);`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`/// Returns the iterator of a certain type.`
Original file line number	Diff line number	Diff line change
`@@ -280,7 +280,7 @@ static LogicalResult verify(ContractionOp op) {`
`280`	`280`	`ArrayRef<StringRef> ContractionOp::getTraitAttrNames() {`
`281`	`281`	`static constexpr StringRef names[2] = {getIndexingMapsAttrName(),`
`282`	`282`	`getIteratorTypesAttrName()};`
`283`		`- return names;`
	`283`	`+ return llvm::makeArrayRef(names);`
`284`	`284`	`}`
`285`	`285`
`286`	`286`	`static int64_t getResultIndex(AffineMap map, AffineExpr targetExpr) {`