nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-04-28 11:07:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #79234 - ortem:fix-hashmap-pretty-printers, r=Mark-Simulacrum

Browse Source 
Resolve typedefs in HashMap gdb/lldb pretty-printers

`GetTypedefedType` (LLDB) and `strip_typedefs` (GDB) calls are needed to resolve key and value types completely.
Without these calls, debugger doesn't show the actual type.

**Before** (without `GetTypedefedType`):
```
(lldb) frame variable hm[0]
(T) hm[0] = { ... }
```

**After** (with `GetTypedefedType`):
```
(lldb) frame variable hm[0]
((i32, alloc::string::String)) hm[0] = { ... }
```

Based on https://github.com/intellij-rust/intellij-rust/pull/6258
This commit is contained in:
Jonas Schievink 2020-11-28 15:58:17 +01:00 committed by GitHub
commit 93d830ed50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/etc/gdb_providers.py
View File

@ -352,7 +352,7 @@ class StdHashMapProvider:
ctrl = table["ctrl"]["pointer"]
self.size = int(table["items"])
self.pair_type = table.type.template_argument(0)
self.pair_type = table.type.template_argument(0).strip_typedefs()
self.new_layout = not table.type.has_key("data")
if self.new_layout:

2
src/etc/lldb_providers.py
View File

@ -531,7 +531,7 @@ class StdHashMapSyntheticProvider:
ctrl = table.GetChildMemberWithName("ctrl").GetChildAtIndex(0)
self.size = table.GetChildMemberWithName("items").GetValueAsUnsigned()
self.pair_type = table.type.template_args[0]
self.pair_type = table.type.template_args[0].GetTypedefedType()
self.pair_type_size = self.pair_type.GetByteSize()
self.new_layout = not table.GetChildMemberWithName("data").IsValid()