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
@@ -18,6 +18,8 @@
 
 #include <cstddef>
 
+#include "llvm/Support/Compiler.h"
+
 namespace llvm {
 
 //===----------------------------------------------------------------------===//
@@ -26,7 +28,8 @@
 
 /// Find the length of an array.
 template <class T, std::size_t N>
-constexpr inline size_t array_lengthof(T (&)[N]) {
+constexpr inline LLVM_DEPRECATED("Use std::size instead.", "std::size") size_t
+    array_lengthof(T (&)[N]) {
   return N;
 }