[lldb][DataFormatter] unordered_map: account for new libc++ __hash_node layout #68574
Conversation
|
@llvm/pr-subscribers-lldb ChangesSince D101206 the This patch accounts for this possible new layout by getting a handle to the union before doing the by-name Full diff: https://github.com/llvm/llvm-project/pull/68574.diff 1 Files Affected:
diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxUnorderedMap.cpp b/lldb/source/Plugins/Language/CPlusPlus/LibCxxUnorderedMap.cpp
index 14776cdf808157d..03619385b7d9968 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxUnorderedMap.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxUnorderedMap.cpp
@@ -162,10 +162,18 @@ lldb::ValueObjectSP lldb_private::formatters::
if (!node_sp || error.Fail())
return nullptr;
- value_sp = node_sp->GetChildMemberWithName("__value_");
hash_sp = node_sp->GetChildMemberWithName("__hash_");
- if (!value_sp || !hash_sp)
+ if (!hash_sp)
return nullptr;
+
+ value_sp = node_sp->GetChildMemberWithName("__value_");
+ if (!value_sp) {
+ // Newer libc++ versions wrap the `__value_` in an anonymous union.
+ auto anon_union = node_sp->GetChildAtIndex(2);
+ value_sp = anon_union->GetChildMemberWithName("__value_");
+ if (!value_sp)
+ return nullptr;
+ }
}
m_elements_cache.push_back(
{value_sp.get(), hash_sp->GetValueAsUnsigned(0)});
|
Michael137
force-pushed
the
bugfix/lldb-map-formatter-fix
branch
from
b9313eb to
9001e6a
Compare
|
|
||
| value_sp = node_sp->GetChildMemberWithName("__value_"); | ||
| if (!value_sp) { | ||
| // Newer libc++ versions wrap the `__value_` in an anonymous union. |
There was a problem hiding this comment.
It might be useful to specify when this was introduced in libc++ in case this logic gets updated again in the future for an even newer libc++.
There was a problem hiding this comment.
Agreed
Let me know if latest comment provides enough context/info (since the libc++ change hasn't landed yet I used the phab ID instead of commit hash)
There was a problem hiding this comment.
Definitely better. I assume phabricator will be read-only mode for quite a while to come, so I'm not too worried about it being difficult to find. We should probably update it with a commit hash once it lands though.
There was a problem hiding this comment.
Added the commit hash
…de layout Since D101206 (`ba79fb2e1ff7130cde02fbbd325f0f96f8a522ca`) the `__hash_node::__value_` member is wrapped in an anonymous union. `ValueObject::GetChildMemberWithName` doesn't see through the union. This patch accounts for this possible new layout by getting a handle to the union before doing the by-name `__value_` lookup.
Michael137
force-pushed
the
bugfix/lldb-map-formatter-fix
branch
from
8ff81e2 to
33475b1
Compare
|
✅ With the latest revision this PR passed the C/C++ code formatter. |
…de layout (llvm#68574) Since D101206 (`ba79fb2e1ff7130cde02fbbd325f0f96f8a522ca`) the `__hash_node::__value_` member is wrapped in an anonymous union. `ValueObject::GetChildMemberWithName` doesn't see through the union. This patch accounts for this possible new layout by getting a handle to the union before doing the by-name `__value_` lookup. (cherry picked from commit 7493d45)
Since D101206 the
__hash_node::__value_member is wrapped in an anonymous union.ValueObject::GetChildMemberWithNamedoesn't see through the union.This patch accounts for this possible new layout by getting a handle to the union before doing the by-name
__value_lookup.