diff options
author | Fangrui Song <maskray@google.com> | 2019-07-08 07:07:05 +0000 |
---|---|---|
committer | Fangrui Song <maskray@google.com> | 2019-07-08 07:07:05 +0000 |
commit | 23d10f7a4edde835a7cd26679ffb46ba3759df73 (patch) | |
tree | 8550efd854b52fcd5a36d2a21565ae7511d56e5a /lldb/include | |
parent | 38902350ef4a994bf47e2a248faaca9a93adb64e (diff) | |
download | bcm5719-llvm-23d10f7a4edde835a7cd26679ffb46ba3759df73.tar.gz bcm5719-llvm-23d10f7a4edde835a7cd26679ffb46ba3759df73.zip |
Change LaunchThread interface to return an Expected for non-Apple-non-Windows
Fixes Linux build errors after D64163/r365226
llvm-svn: 365295
Diffstat (limited to 'lldb/include')
-rw-r--r-- | lldb/include/lldb/Host/Host.h | 2 | ||||
-rw-r--r-- | lldb/include/lldb/Host/HostNativeProcessBase.h | 2 | ||||
-rw-r--r-- | lldb/include/lldb/Host/HostProcess.h | 5 | ||||
-rw-r--r-- | lldb/include/lldb/Host/posix/HostProcessPosix.h | 5 |
4 files changed, 8 insertions, 6 deletions
diff --git a/lldb/include/lldb/Host/Host.h b/lldb/include/lldb/Host/Host.h index 2cb3aafc1af..884c5cf6321 100644 --- a/lldb/include/lldb/Host/Host.h +++ b/lldb/include/lldb/Host/Host.h @@ -99,7 +99,7 @@ public: /// was spawned to monitor \a pid. /// /// \see static void Host::StopMonitoringChildProcess (uint32_t) - static HostThread + static llvm::Expected<HostThread> StartMonitoringChildProcess(const MonitorChildProcessCallback &callback, lldb::pid_t pid, bool monitor_signals); diff --git a/lldb/include/lldb/Host/HostNativeProcessBase.h b/lldb/include/lldb/Host/HostNativeProcessBase.h index e8b0683da8b..aaa517d5321 100644 --- a/lldb/include/lldb/Host/HostNativeProcessBase.h +++ b/lldb/include/lldb/Host/HostNativeProcessBase.h @@ -35,7 +35,7 @@ public: lldb::process_t GetSystemHandle() const { return m_process; } - virtual HostThread + virtual llvm::Expected<HostThread> StartMonitoring(const Host::MonitorChildProcessCallback &callback, bool monitor_signals) = 0; diff --git a/lldb/include/lldb/Host/HostProcess.h b/lldb/include/lldb/Host/HostProcess.h index 56eaa465f07..d48ff1fc90e 100644 --- a/lldb/include/lldb/Host/HostProcess.h +++ b/lldb/include/lldb/Host/HostProcess.h @@ -43,8 +43,9 @@ public: lldb::pid_t GetProcessId() const; bool IsRunning() const; - HostThread StartMonitoring(const Host::MonitorChildProcessCallback &callback, - bool monitor_signals); + llvm::Expected<HostThread> + StartMonitoring(const Host::MonitorChildProcessCallback &callback, + bool monitor_signals); HostNativeProcessBase &GetNativeProcess(); const HostNativeProcessBase &GetNativeProcess() const; diff --git a/lldb/include/lldb/Host/posix/HostProcessPosix.h b/lldb/include/lldb/Host/posix/HostProcessPosix.h index ce0b8e8b176..a313358631b 100644 --- a/lldb/include/lldb/Host/posix/HostProcessPosix.h +++ b/lldb/include/lldb/Host/posix/HostProcessPosix.h @@ -32,8 +32,9 @@ public: lldb::pid_t GetProcessId() const override; bool IsRunning() const override; - HostThread StartMonitoring(const Host::MonitorChildProcessCallback &callback, - bool monitor_signals) override; + llvm::Expected<HostThread> + StartMonitoring(const Host::MonitorChildProcessCallback &callback, + bool monitor_signals) override; }; } // namespace lldb_private |