Skip to content

Commit 36117cc

Browse files
[llvm] Declare llvm::makeArrayRef as obsolete
Also cleans up a few remaining references. This is the final commit for the series started by https://reviews.llvm.org/D140896
1 parent b1372fe commit 36117cc

File tree

3 files changed

+23
-11
lines changed

3 files changed

+23
-11
lines changed

llvm/include/llvm/ADT/ArrayRef.h

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -491,10 +491,10 @@ namespace llvm {
491491
template <typename T, std::size_t N>
492492
ArrayRef(const std::array<T, N> &Vec) -> ArrayRef<T>;
493493

494-
/// Deduction guide to construct an ArrayRef from an ArrayRef (no-op) (const)
494+
/// Deduction guide to construct an ArrayRef from an ArrayRef (const)
495495
template <typename T> ArrayRef(const ArrayRef<T> &Vec) -> ArrayRef<T>;
496496

497-
/// Deduction guide to construct an ArrayRef from an ArrayRef (no-op)
497+
/// Deduction guide to construct an ArrayRef from an ArrayRef
498498
template <typename T> ArrayRef(ArrayRef<T> &Vec) -> ArrayRef<T>;
499499

500500
/// Deduction guide to construct an ArrayRef from a C array.
@@ -505,59 +505,71 @@ namespace llvm {
505505
/// @name ArrayRef Convenience constructors
506506
/// @{
507507
/// Construct an ArrayRef from a single element.
508-
template<typename T>
508+
template <typename T>
509+
LLVM_DEPRECATED("Use deduction guide instead", "ArrayRef")
509510
ArrayRef<T> makeArrayRef(const T &OneElt) {
510511
return OneElt;
511512
}
512513

513514
/// Construct an ArrayRef from a pointer and length.
514-
template<typename T>
515+
template <typename T>
516+
LLVM_DEPRECATED("Use deduction guide instead", "ArrayRef")
515517
ArrayRef<T> makeArrayRef(const T *data, size_t length) {
516518
return ArrayRef<T>(data, length);
517519
}
518520

519521
/// Construct an ArrayRef from a range.
520-
template<typename T>
522+
template <typename T>
523+
LLVM_DEPRECATED("Use deduction guide instead", "ArrayRef")
521524
ArrayRef<T> makeArrayRef(const T *begin, const T *end) {
522525
return ArrayRef<T>(begin, end);
523526
}
524527

525528
/// Construct an ArrayRef from a SmallVector.
526529
template <typename T>
530+
LLVM_DEPRECATED("Use deduction guide instead", "ArrayRef")
527531
ArrayRef<T> makeArrayRef(const SmallVectorImpl<T> &Vec) {
528532
return Vec;
529533
}
530534

531535
/// Construct an ArrayRef from a SmallVector.
532536
template <typename T, unsigned N>
537+
LLVM_DEPRECATED("Use deduction guide instead", "ArrayRef")
533538
ArrayRef<T> makeArrayRef(const SmallVector<T, N> &Vec) {
534539
return Vec;
535540
}
536541

537542
/// Construct an ArrayRef from a std::vector.
538-
template<typename T>
543+
template <typename T>
544+
LLVM_DEPRECATED("Use deduction guide instead", "ArrayRef")
539545
ArrayRef<T> makeArrayRef(const std::vector<T> &Vec) {
540546
return Vec;
541547
}
542548

543549
/// Construct an ArrayRef from a std::array.
544550
template <typename T, std::size_t N>
551+
LLVM_DEPRECATED("Use deduction guide instead", "ArrayRef")
545552
ArrayRef<T> makeArrayRef(const std::array<T, N> &Arr) {
546553
return Arr;
547554
}
548555

549556
/// Construct an ArrayRef from an ArrayRef (no-op) (const)
550-
template <typename T> ArrayRef<T> makeArrayRef(const ArrayRef<T> &Vec) {
557+
template <typename T>
558+
LLVM_DEPRECATED("Use deduction guide instead", "ArrayRef")
559+
ArrayRef<T> makeArrayRef(const ArrayRef<T> &Vec) {
551560
return Vec;
552561
}
553562

554563
/// Construct an ArrayRef from an ArrayRef (no-op)
555-
template <typename T> ArrayRef<T> &makeArrayRef(ArrayRef<T> &Vec) {
564+
template <typename T>
565+
LLVM_DEPRECATED("Use deduction guide instead", "ArrayRef")
566+
ArrayRef<T> &makeArrayRef(ArrayRef<T> &Vec) {
556567
return Vec;
557568
}
558569

559570
/// Construct an ArrayRef from a C array.
560-
template<typename T, size_t N>
571+
template <typename T, size_t N>
572+
LLVM_DEPRECATED("Use deduction guide instead", "ArrayRef")
561573
ArrayRef<T> makeArrayRef(const T (&Arr)[N]) {
562574
return ArrayRef<T>(Arr);
563575
}

mlir/lib/Dialect/SPIRV/Transforms/SPIRVWebGPUTransforms.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ Value lowerExtendedMultiplication(Operation *mulOp, PatternRewriter &rewriter,
130130
Value high = combineDigits(resultDigits[2], resultDigits[3]);
131131

132132
return rewriter.create<CompositeConstructOp>(
133-
loc, mulOp->getResultTypes().front(), llvm::makeArrayRef({low, high}));
133+
loc, mulOp->getResultTypes().front(), llvm::ArrayRef({low, high}));
134134
}
135135

136136
//===----------------------------------------------------------------------===//

mlir/lib/Dialect/Transform/IR/TransformInterfaces.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ void transform::TransformResults::setParams(
394394
assert(paramSegments[position].data() == nullptr && "params already set");
395395
size_t start = this->params.size();
396396
llvm::append_range(this->params, params);
397-
paramSegments[position] = makeArrayRef(this->params).drop_front(start);
397+
paramSegments[position] = ArrayRef(this->params).drop_front(start);
398398
}
399399

400400
ArrayRef<Operation *>

0 commit comments

Comments
 (0)