https://github.com/Jlalond updated https://github.com/llvm/llvm-project/pull/168425
>From 6c12e75145b184e4a8a19742dbd8db23e0e1e619 Mon Sep 17 00:00:00 2001 From: Jacob Lalonde <[email protected]> Date: Mon, 17 Nov 2025 10:51:50 -0800 Subject: [PATCH] Move lock guard before AddTargetInternal instead of holding the mutex for the entire target creation and causing a deadlock with the module callback when running in parallel. --- lldb/source/Target/TargetList.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/lldb/source/Target/TargetList.cpp b/lldb/source/Target/TargetList.cpp index 2e03bc1e38ea0..4810de0a19a65 100644 --- a/lldb/source/Target/TargetList.cpp +++ b/lldb/source/Target/TargetList.cpp @@ -48,11 +48,16 @@ Status TargetList::CreateTarget(Debugger &debugger, LoadDependentFiles load_dependent_files, const OptionGroupPlatform *platform_options, TargetSP &target_sp) { - std::lock_guard<std::recursive_mutex> guard(m_target_list_mutex); + // Create Target Internal does not modify and state + // directly and instead calls into methods which + // they themselves are thread-safe. We do this so + // the locate module call back doesn't cause a re-entry + // dead-lock when creating the target. auto result = TargetList::CreateTargetInternal( debugger, user_exe_path, triple_str, load_dependent_files, platform_options, target_sp); + std::lock_guard<std::recursive_mutex> guard(m_target_list_mutex); if (target_sp && result.Success()) AddTargetInternal(target_sp, /*do_select*/ true); return result; @@ -63,11 +68,16 @@ Status TargetList::CreateTarget(Debugger &debugger, const ArchSpec &specified_arch, LoadDependentFiles load_dependent_files, PlatformSP &platform_sp, TargetSP &target_sp) { - std::lock_guard<std::recursive_mutex> guard(m_target_list_mutex); + // Create Target Internal does not modify and state + // directly and instead calls into methods which + // they themselves are thread-safe. We do this so + // the locate module call back doesn't cause a re-entry + // dead-lock when creating the target. auto result = TargetList::CreateTargetInternal( debugger, user_exe_path, specified_arch, load_dependent_files, platform_sp, target_sp); + std::lock_guard<std::recursive_mutex> guard(m_target_list_mutex); if (target_sp && result.Success()) AddTargetInternal(target_sp, /*do_select*/ true); return result; _______________________________________________ lldb-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
