diff --git a/clang/include/clang/Basic/DirectoryEntry.h b/clang/include/clang/Basic/DirectoryEntry.h
index 19d52c09dbcce5..9ddeb65ef19452 100644
--- a/clang/include/clang/Basic/DirectoryEntry.h
+++ b/clang/include/clang/Basic/DirectoryEntry.h
@@ -133,35 +133,19 @@ template <class RefTy> class MapEntryOptionalStorage {
   void reset() { MaybeRef = optional_none_tag(); }
 
   bool has_value() const { return MaybeRef.hasOptionalValue(); }
-  LLVM_DEPRECATED("Use has_value instead.", "has_value") bool hasValue() const {
-    return MaybeRef.hasOptionalValue();
-  }
 
   RefTy &value() & {
     assert(has_value());
     return MaybeRef;
   }
-  LLVM_DEPRECATED("Use value instead.", "value") RefTy &getValue() & {
-    assert(has_value());
-    return MaybeRef;
-  }
   RefTy const &value() const & {
     assert(has_value());
     return MaybeRef;
   }
-  LLVM_DEPRECATED("Use value instead.", "value")
-  RefTy const &getValue() const & {
-    assert(has_value());
-    return MaybeRef;
-  }
   RefTy &&value() && {
     assert(has_value());
     return std::move(MaybeRef);
   }
-  LLVM_DEPRECATED("Use value instead.", "value") RefTy &&getValue() && {
-    assert(has_value());
-    return std::move(MaybeRef);
-  }
 
   template <class... Args> void emplace(Args &&...args) {
     MaybeRef = RefTy(std::forward<Args>(args)...);