Merge pull request swiftlang#7048 from medismailben/swift/release/5.9

JDevlieghere · web-flow · commit 5cd14b982b25 · 2023-07-03T13:56:25.000-07:00
[lldb] Fix data race when interacting with python scripts
diff --git a/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPythonImpl.h b/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPythonImpl.h
@@ -375,11 +375,18 @@ class ScriptInterpreterPythonImpl : public ScriptInterpreterPython {
 
   void LeaveSession();
 
-  uint32_t IsExecutingPython() const { return m_lock_count > 0; }
+  uint32_t IsExecutingPython() {
+    std::lock_guard<std::mutex> guard(m_mutex);
+    return m_lock_count > 0;
+  }
 
-  uint32_t IncrementLockCount() { return ++m_lock_count; }
+  uint32_t IncrementLockCount() {
+    std::lock_guard<std::mutex> guard(m_mutex);
+    return ++m_lock_count;
+  }
 
   uint32_t DecrementLockCount() {
+    std::lock_guard<std::mutex> guard(m_mutex);
     if (m_lock_count > 0)
       --m_lock_count;
     return m_lock_count;
@@ -419,6 +426,7 @@ class ScriptInterpreterPythonImpl : public ScriptInterpreterPython {
   bool m_pty_secondary_is_open;
   bool m_valid_session;
   uint32_t m_lock_count;
+  std::mutex m_mutex;
   PyThreadState *m_command_thread_state;
 };
 
diff --git a/lldb/source/Target/Process.cpp b/lldb/source/Target/Process.cpp
@@ -2609,6 +2609,7 @@ Process::WaitForProcessStopPrivate(EventSP &event_sp,
 }
 
 void Process::LoadOperatingSystemPlugin(bool flush) {
+  std::lock_guard<std::recursive_mutex> guard(m_thread_mutex);
   if (flush)
     m_thread_list.Clear();
   m_os_up.reset(OperatingSystem::FindPlugin(this, nullptr));

Original file line number	Diff line number	Diff line change
`@@ -2609,6 +2609,7 @@ Process::WaitForProcessStopPrivate(EventSP &event_sp,`
`2609`	`2609`	`}`
`2610`	`2610`
`2611`	`2611`	`void Process::LoadOperatingSystemPlugin(bool flush) {`
	`2612`	`+ std::lock_guard<std::recursive_mutex> guard(m_thread_mutex);`
`2612`	`2613`	`if (flush)`
`2613`	`2614`	`m_thread_list.Clear();`
`2614`	`2615`	`m_os_up.reset(OperatingSystem::FindPlugin(this, nullptr));`