diff --git a/llvm/include/llvm/ADT/Optional.h b/llvm/include/llvm/ADT/Optional.h
--- a/llvm/include/llvm/ADT/Optional.h
+++ b/llvm/include/llvm/ADT/Optional.h
@@ -92,7 +92,10 @@
   }
 
   constexpr bool has_value() const noexcept { return hasVal; }
-  constexpr bool hasValue() const noexcept { return hasVal; }
+  [[deprecated("Use has_value instead.")]] constexpr bool
+  hasValue() const noexcept {
+    return hasVal;
+  }
 
   T &value() &noexcept {
     assert(hasVal);
@@ -203,7 +206,10 @@
   }
 
   constexpr bool has_value() const noexcept { return hasVal; }
-  constexpr bool hasValue() const noexcept { return hasVal; }
+  [[deprecated("Use has_value instead.")]] constexpr bool
+  hasValue() const noexcept {
+    return hasVal;
+  }
 
   T &value() &noexcept {
     assert(hasVal);
@@ -309,7 +315,9 @@
 
   constexpr explicit operator bool() const { return has_value(); }
   constexpr bool has_value() const { return Storage.has_value(); }
-  constexpr bool hasValue() const { return Storage.has_value(); }
+  [[deprecated("Use has_value instead.")]] constexpr bool hasValue() const {
+    return Storage.has_value();
+  }
   constexpr const T *operator->() const { return getPointer(); }
   T *operator->() { return getPointer(); }
   constexpr const T &operator*() const & { return value(); }