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
@@ -258,6 +258,8 @@
     Storage.emplace(std::forward<ArgTypes>(Args)...);
   }
 
+  LLVM_DEPRECATED("Use X ? Optional<T>(*X) : std::nullopt instead.",
+                  "X ? Optional<T>(*X) : std::nullopt")
   static constexpr Optional create(const T *y) {
     return y ? Optional(*y) : Optional();
   }