Index: clangd/Function.h
===================================================================
--- clangd/Function.h
+++ clangd/Function.h
@@ -138,6 +138,33 @@
 }
 
 namespace detail {
+/// Optional-like type that sets its value to llvm::None when it was moved
+/// constructed from.
+template <class T> class CleaningOptional {
+public:
+  static_assert(std::is_same<typename std::decay<T>::type, T>::value,
+                "Implementation currently only supports decayed types");
+
+  CleaningOptional(T Value) : Value(std::move(Value)) {}
+
+  CleaningOptional(CleaningOptional &&Other) : Value(std::move(Other.Value)) {
+    Other.Value = llvm::None;
+  }
+
+  CleaningOptional &operator=(CleaningOptional &&Other) {
+    Value = std::move(Other.Value);
+    Other.Value = llvm::None;
+  }
+
+  explicit operator bool() const { return static_cast<bool>(Value); }
+
+  T &operator*() { return *Value; }
+  const T &operator*() const { return *Value; }
+
+private:
+  llvm::Optional<T> Value;
+};
+
 /// Runs provided callback in destructor. Use onScopeExit helper function to
 /// create this object.
 template <class Func> struct ScopeExitGuard {
@@ -159,7 +186,7 @@
   ScopeExitGuard &operator=(ScopeExitGuard &&Other) = default;
 
 private:
-  llvm::Optional<Func> F;
+  CleaningOptional<Func> F;
 };
 } // namespace detail