[Lldb-commits] [lldb] 9e66ea5 - Revert "[LLDB] Allow expression evaluators to set arbitrary timeouts"

[walter erquinigo via lldb-commits]

Author: walter erquinigo
Date: 2023-08-22T17:04:53-04:00
New Revision: 9e66ea503ea1727b333ecb088e73e81a4c0736d5

URL: https://github.com/llvm/llvm-project/commit/9e66ea503ea1727b333ecb088e73e81a4c0736d5
DIFF: https://github.com/llvm/llvm-project/commit/9e66ea503ea1727b333ecb088e73e81a4c0736d5.diff

LOG: Revert "[LLDB] Allow expression evaluators to set arbitrary timeouts"

This reverts commit a4dbdf4749938396dbf913478289fa426d8341ae because it breaks the buildbot https://lab.llvm.org/buildbot/#/builders/68/builds/58591

Added: 
    

Modified: 
    lldb/include/lldb/Target/Target.h

Removed: 
    


################################################################################
diff  --git a/lldb/include/lldb/Target/Target.h b/lldb/include/lldb/Target/Target.h
index ed0ecbbddbf814..f86bd3cb4ee55d 100644
--- a/lldb/include/lldb/Target/Target.h
+++ b/lldb/include/lldb/Target/Target.h
@@ -346,9 +346,16 @@ class EvaluateExpressionOptions {
     m_use_dynamic = dynamic;
   }
 
-  const Timeout<std::micro> &GetTimeout() const { return m_timeout; }
+  const Timeout<std::micro> &GetTimeout() const {
+    assert(m_timeout && m_timeout->count() > 0);
+    return m_timeout;
+  }
 
-  void SetTimeout(const Timeout<std::micro> &timeout) { m_timeout = timeout; }
+  void SetTimeout(const Timeout<std::micro> &timeout) {
+    // Disallow setting a non-zero timeout.
+    if (timeout && timeout->count() > 0)
+      m_timeout = timeout;
+  }
 
   const Timeout<std::micro> &GetOneThreadTimeout() const {
     return m_one_thread_timeout;