diff --git a/llvm/include/llvm/Analysis/MemoryDependenceAnalysis.h b/llvm/include/llvm/Analysis/MemoryDependenceAnalysis.h
index feb22c2509790..64a635ebb4cc7 100644
--- a/llvm/include/llvm/Analysis/MemoryDependenceAnalysis.h
+++ b/llvm/include/llvm/Analysis/MemoryDependenceAnalysis.h
@@ -24,6 +24,7 @@
 #include "llvm/IR/PredIteratorCache.h"
 #include "llvm/IR/ValueHandle.h"
 #include "llvm/Pass.h"
+#include <optional>
 
 namespace llvm {
 
@@ -470,7 +471,7 @@ class MemoryDependenceResults {
   void releaseMemory();
 
   /// Return the clobber offset to dependent instruction.
-  Optional<int32_t> getClobberOffset(LoadInst *DepInst) const {
+  std::optional<int32_t> getClobberOffset(LoadInst *DepInst) const {
     const auto Off = ClobberOffsets.find(DepInst);
     if (Off != ClobberOffsets.end())
       return Off->getSecond();
@@ -524,7 +525,7 @@ class MemoryDependenceAnalysis
 /// A wrapper analysis pass for the legacy pass manager that exposes a \c
 /// MemoryDepnedenceResults instance.
 class MemoryDependenceWrapperPass : public FunctionPass {
-  Optional<MemoryDependenceResults> MemDep;
+  std::optional<MemoryDependenceResults> MemDep;
 
 public:
   static char ID;