diff options
author | Cameron Desrochers <cameron@moodycamel.com> | 2019-10-09 18:27:33 +0000 |
---|---|---|
committer | Cameron Desrochers <cameron@moodycamel.com> | 2019-10-09 18:27:33 +0000 |
commit | 89386daa9571add3bc30311dc0902f82a1148a4c (patch) | |
tree | 73b908fdaee2d992ac09ba5269509307dfb1b08c /lldb/source/Plugins/Language/CPlusPlus/LibCxxQueue.cpp | |
parent | 72c7c21dda99bf2a388255ea167914771704a6f9 (diff) | |
download | bcm5719-llvm-89386daa9571add3bc30311dc0902f82a1148a4c.tar.gz bcm5719-llvm-89386daa9571add3bc30311dc0902f82a1148a4c.zip |
[LLDB] Fix for synthetic children memory leak
The lifetime of a ValueObject and all its derivative ValueObjects (children, clones, etc.) is managed by a ClusterManager. These objects are only destroyed when every shared pointer to any of the managed objects in the cluster is destroyed. This means that no object in the cluster can store a shared pointer to another object in the cluster without creating a memory leak of the entire cluster. However, some of the synthetic children front-end implementations do exactly this; this patch fixes that.
Differential Revision: https://reviews.llvm.org/D68641
llvm-svn: 374195
Diffstat (limited to 'lldb/source/Plugins/Language/CPlusPlus/LibCxxQueue.cpp')
-rw-r--r-- | lldb/source/Plugins/Language/CPlusPlus/LibCxxQueue.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxQueue.cpp b/lldb/source/Plugins/Language/CPlusPlus/LibCxxQueue.cpp index 4b72089c6ba..2f06d684f95 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxQueue.cpp +++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxQueue.cpp @@ -38,16 +38,21 @@ public: } private: - ValueObjectSP m_container_sp; + // The lifetime of a ValueObject and all its derivative ValueObjects + // (children, clones, etc.) is managed by a ClusterManager. These + // objects are only destroyed when every shared pointer to any of them + // is destroyed, so we must not store a shared pointer to any ValueObject + // derived from our backend ValueObject (since we're in the same cluster). + ValueObject* m_container_sp = nullptr; }; } // namespace bool QueueFrontEnd::Update() { - m_container_sp.reset(); + m_container_sp = nullptr; ValueObjectSP c_sp = m_backend.GetChildMemberWithName(ConstString("c"), true); if (!c_sp) return false; - m_container_sp = c_sp->GetSyntheticValue(); + m_container_sp = c_sp->GetSyntheticValue().get(); return false; } |