summaryrefslogtreecommitdiff
path: root/lldb/source/Core/Module.cpp
diff options
context:
space:
mode:
authorAdrian Prantl <aprantl@apple.com>2022-11-14 16:24:36 -0800
committerAdrian Prantl <aprantl@apple.com>2022-11-16 15:51:26 -0800
commit6eaedbb52f2a616e644e5acc7279c8b07c4cfe82 (patch)
tree4fe3af14033dc99c540bbeec32c4d1f9a3f3e120 /lldb/source/Core/Module.cpp
parent0fcb26c5b6487bf9b31670122f8c931ac020bb34 (diff)
Make CompilerType safe
When a process gets restarted TypeSystem objects associated with it may get deleted, and any CompilerType objects holding on to a reference to that type system are a use-after-free in waiting. Because of the SBAPI, we don't have tight control over where CompilerTypes go and when they are used. This is particularly a problem in the Swift plugin, where the scratch TypeSystem can be restarted while the process is still running. The Swift plugin has a lock to prevent abuse, but where there's a lock there can be bugs. This patch changes CompilerType to store a std::weak_ptr<TypeSystem>. Most of the std::weak_ptr<TypeSystem>* uglyness is hidden by introducing a wrapper class CompilerType::WrappedTypeSystem that has a dyn_cast_or_null() method. The only sites that need to know about the weak pointer implementation detail are the ones that deal with creating TypeSystems. rdar://101505232 Differential Revision: https://reviews.llvm.org/D136650
Diffstat (limited to 'lldb/source/Core/Module.cpp')
-rw-r--r--lldb/source/Core/Module.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/lldb/source/Core/Module.cpp b/lldb/source/Core/Module.cpp
index 20bd02f101fc..b1cc0dd58211 100644
--- a/lldb/source/Core/Module.cpp
+++ b/lldb/source/Core/Module.cpp
@@ -364,13 +364,13 @@ void Module::SetUUID(const lldb_private::UUID &uuid) {
}
}
-llvm::Expected<TypeSystem &>
+llvm::Expected<TypeSystemSP>
Module::GetTypeSystemForLanguage(LanguageType language) {
return m_type_system_map.GetTypeSystemForLanguage(language, this, true);
}
void Module::ForEachTypeSystem(
- llvm::function_ref<bool(TypeSystem *)> callback) {
+ llvm::function_ref<bool(lldb::TypeSystemSP)> callback) {
m_type_system_map.ForEach(callback);
}