maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[Process] Fix another thread_result_t & nullptr incompatibility. 

llvm-svn: 361548
This commit is contained in:
Jonas Devlieghere 2019-05-23 20:25:49 +00:00
parent 7d6c0bce50
commit edb52e2e7d
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lldb/source/Target/Process.cpp
View File

@ -3638,7 +3638,7 @@ void Process::ControlPrivateStateThread(uint32_t signal) {
} }
if (signal == eBroadcastInternalStateControlStop) { if (signal == eBroadcastInternalStateControlStop) {
thread_result_t result = nullptr; thread_result_t result = {};
m_private_state_thread.Join(&result); m_private_state_thread.Join(&result);
m_private_state_thread.Reset(); 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. // it was doing yet, so don't try to change it on the way out.
if (!is_secondary_thread) if (!is_secondary_thread)
m_public_run_lock.SetStopped(); m_public_run_lock.SetStopped();
return nullptr; return {};
} }
// Process Event Data // Process Event Data
@ -4073,8 +4073,8 @@ void Process::ProcessEventData::DoOnRemoval(Event *event_ptr) {
process_sp->PrivateResume(); process_sp->PrivateResume();
} else { } else {
bool hijacked = bool hijacked =
process_sp->IsHijackedForEvent(eBroadcastBitStateChanged) process_sp->IsHijackedForEvent(eBroadcastBitStateChanged) &&
&& !process_sp->StateChangedIsHijackedForSynchronousResume(); !process_sp->StateChangedIsHijackedForSynchronousResume();
if (!hijacked) { if (!hijacked) {
// If we didn't restart, run the Stop Hooks here. // If we didn't restart, run the Stop Hooks here.