3 files changed, 6 insertions, 6 deletions
diff --git a/lldb/include/lldb/Interpreter/OptionValueFileSpec.h b/lldb/include/lldb/Interpreter/OptionValueFileSpec.h
index 1a2024547ab..7569a5f84c9 100644
--- a/lldb/include/lldb/Interpreter/OptionValueFileSpec.h
+++ b/lldb/include/lldb/Interpreter/OptionValueFileSpec.h
@@ -13,7 +13,7 @@
 #include "lldb/Interpreter/OptionValue.h"
 
 #include "lldb/Host/FileSpec.h"
-#include "lldb/Host/TimeValue.h"
+#include "llvm/Support/Chrono.h"
 
 namespace lldb_private {
 
@@ -48,7 +48,7 @@ public:
     m_current_value = m_default_value;
     m_value_was_set = false;
     m_data_sp.reset();
-    m_data_mod_time.Clear();
+    m_data_mod_time = llvm::sys::TimePoint<>();
     return true;
   }
 
@@ -85,7 +85,7 @@ protected:
   FileSpec m_current_value;
   FileSpec m_default_value;
   lldb::DataBufferSP m_data_sp;
-  TimeValue m_data_mod_time;
+  llvm::sys::TimePoint<> m_data_mod_time;
   uint32_t m_completion_mask;
   bool m_resolve;
 };
diff --git a/lldb/source/Commands/CommandObjectTarget.cpp b/lldb/source/Commands/CommandObjectTarget.cpp
index 8e1e6678969..a40f9c9ac8e 100644
--- a/lldb/source/Commands/CommandObjectTarget.cpp
+++ b/lldb/source/Commands/CommandObjectTarget.cpp
@@ -21,6 +21,7 @@
 #include "lldb/DataFormatters/ValueObjectPrinter.h"
 #include "lldb/Host/StringConvert.h"
 #include "lldb/Host/Symbols.h"
+#include "lldb/Host/TimeValue.h"
 #include "lldb/Interpreter/Args.h"
 #include "lldb/Interpreter/CommandInterpreter.h"
 #include "lldb/Interpreter/CommandReturnObject.h"
diff --git a/lldb/source/Interpreter/OptionValueFileSpec.cpp b/lldb/source/Interpreter/OptionValueFileSpec.cpp
index 479d57eb27f..f5c292d6f49 100644
--- a/lldb/source/Interpreter/OptionValueFileSpec.cpp
+++ b/lldb/source/Interpreter/OptionValueFileSpec.cpp
@@ -79,7 +79,7 @@ Error OptionValueFileSpec::SetValueFromString(llvm::StringRef value,
       m_value_was_set = true;
       m_current_value.SetFile(value.str(), m_resolve);
       m_data_sp.reset();
-      m_data_mod_time.Clear();
+      m_data_mod_time = llvm::sys::TimePoint<>();
       NotifyValueChanged();
     } else {
       error.SetErrorString("invalid value string");
@@ -117,8 +117,7 @@ size_t OptionValueFileSpec::AutoComplete(CommandInterpreter &interpreter,
 const lldb::DataBufferSP &
 OptionValueFileSpec::GetFileContents(bool null_terminate) {
   if (m_current_value) {
-    const TimeValue file_mod_time =
-        FileSystem::GetModificationTime(m_current_value);
+    const auto file_mod_time = FileSystem::GetModificationTime(m_current_value);
     if (m_data_sp && m_data_mod_time == file_mod_time)
       return m_data_sp;
     if (null_terminate)