diff --git a/llvm/include/llvm/ADT/STLArrayExtras.h b/llvm/include/llvm/ADT/STLArrayExtras.h
--- a/llvm/include/llvm/ADT/STLArrayExtras.h
+++ b/llvm/include/llvm/ADT/STLArrayExtras.h
@@ -26,7 +26,8 @@
 
 /// Find the length of an array.
 template <class T, std::size_t N>
-constexpr inline size_t array_lengthof(T (&)[N]) {
+[[deprecated("Use std::size(T(&)[N) instead")]] constexpr inline size_t
+array_lengthof(T (&)[N]) {
   return N;
 }