summaryrefslogtreecommitdiffstats
path: root/lldb/source/Target/Process.cpp
diff options
context:
space:
mode:
authorJonas Devlieghere <jonas@devlieghere.com>2019-05-23 20:25:49 +0000
committerJonas Devlieghere <jonas@devlieghere.com>2019-05-23 20:25:49 +0000
commitedb52e2e7d075b1fec13034deaa56d3c32d100ac (patch)
tree4ea40637d2b7f85abe5e283ad73d8e7f9e43b5fd /lldb/source/Target/Process.cpp
parent7d6c0bce503fd92fa48db88a944b01fa2e7402b4 (diff)
downloadbcm5719-llvm-edb52e2e7d075b1fec13034deaa56d3c32d100ac.tar.gz
bcm5719-llvm-edb52e2e7d075b1fec13034deaa56d3c32d100ac.zip
[Process] Fix another thread_result_t & nullptr incompatibility.
llvm-svn: 361548
Diffstat (limited to 'lldb/source/Target/Process.cpp')
-rw-r--r--lldb/source/Target/Process.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/lldb/source/Target/Process.cpp b/lldb/source/Target/Process.cpp
index b018a3115a0..7c668a216a3 100644
--- a/lldb/source/Target/Process.cpp
+++ b/lldb/source/Target/Process.cpp
@@ -3638,7 +3638,7 @@ void Process::ControlPrivateStateThread(uint32_t signal) {
}
if (signal == eBroadcastInternalStateControlStop) {
- thread_result_t result = nullptr;
+ thread_result_t result = {};
m_private_state_thread.Join(&result);
m_private_state_thread.Reset();
}
@@ -3913,7 +3913,7 @@ thread_result_t Process::RunPrivateStateThread(bool is_secondary_thread) {
// it was doing yet, so don't try to change it on the way out.
if (!is_secondary_thread)
m_public_run_lock.SetStopped();
- return nullptr;
+ return {};
}
// Process Event Data
@@ -4072,15 +4072,15 @@ void Process::ProcessEventData::DoOnRemoval(Event *event_ptr) {
// public resume.
process_sp->PrivateResume();
} else {
- bool hijacked =
- process_sp->IsHijackedForEvent(eBroadcastBitStateChanged)
- && !process_sp->StateChangedIsHijackedForSynchronousResume();
+ bool hijacked =
+ process_sp->IsHijackedForEvent(eBroadcastBitStateChanged) &&
+ !process_sp->StateChangedIsHijackedForSynchronousResume();
if (!hijacked) {
// If we didn't restart, run the Stop Hooks here.
// Don't do that if state changed events aren't hooked up to the
- // public (or SyncResume) broadcasters. StopHooks are just for
- // real public stops. They might also restart the target,
+ // public (or SyncResume) broadcasters. StopHooks are just for
+ // real public stops. They might also restart the target,
// so watch for that.
process_sp->GetTarget().RunStopHooks();
if (process_sp->GetPrivateState() == eStateRunning)
OpenPOWER on IntegriCloud