-
Notifications
You must be signed in to change notification settings - Fork 15.2k
[LLDB] Make MSVC STL formatters work with (Native/DIA) PDB #150513
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
709ca11
fix(string): make spaces in matcher optional
Nerixyz 119861a
fix(list): fallback to type of value if templates are unavailable
Nerixyz 12b4e32
fix(optional): try searching for _Value first
Nerixyz e6fda6a
fix(deque): fall back to element type if templates are unvailable
Nerixyz eeef5f3
fix(variant): support DIA PDB
Nerixyz 66ab512
fix(variant): support non-trivially destructable types
Nerixyz 25baf35
test(STL): add shell tests for STL types with PDB and NativePDB
Nerixyz e14771a
Merge remote-tracking branch 'upstream/main' into fix/lldb-msstl-pdb
Nerixyz 81dac36
refactor: use API tests
Nerixyz File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,188 @@ | ||
| # REQUIRES: target-windows | ||
|
|
||
| # Test that LLDB can format types from MSVC's STL | ||
| # RUN: split-file %s %t | ||
| # RUN: %build --compiler=clang-cl --std c++20 -o %t.exe -- %t/main.cpp | ||
| # RUN: %lldb -f %t.exe -s \ | ||
| # RUN: %t/commands.input 2>&1 | FileCheck %s | ||
|
|
||
| #--- main.cpp | ||
|
|
||
| #include <bitset> | ||
| #include <coroutine> | ||
| #include <deque> | ||
| #include <forward_list> | ||
| #include <list> | ||
| #include <map> | ||
| #include <memory> | ||
| #include <optional> | ||
| #include <set> | ||
| #include <string> | ||
| #include <tuple> | ||
| #include <unordered_map> | ||
| #include <unordered_set> | ||
| #include <variant> | ||
| #include <vector> | ||
|
|
||
| int main() { | ||
| std::shared_ptr<int> sp = std::make_shared<int>(41); | ||
| std::weak_ptr<int> wp = sp; | ||
| std::unique_ptr<int> unique(new int(42)); | ||
| std::optional<std::u16string> opt = u"abc"; | ||
| std::string str = "str"; | ||
| std::u8string u8str = u8"str"; | ||
| std::wstring wStr = L"wstr"; | ||
| std::tuple<int, bool, float> tuple{1, false, 4.2}; | ||
| std::coroutine_handle<> coroHandle; | ||
| std::bitset<16> bitset(123); | ||
|
|
||
| std::map<int, int> map{{1, 2}, {2, 4}, {3, 6}}; | ||
| auto mapIt = map.find(3); | ||
| std::set<int> set{1, 2, 3}; | ||
| std::multimap<int, int> mMap{{1, 2}, {1, 1}, {2, 4}}; | ||
| std::multiset<int> mSet{1, 2, 3}; | ||
|
|
||
| std::variant<int, float, std::string, std::monostate> variant = "wow"; | ||
| std::list<int> list{1, 2, 3}; | ||
| std::forward_list<int> fwList{1, 2, 3}; | ||
|
|
||
| std::unordered_map<int, int> uMap{{1, 2}, {2, 4}, {3, 6}}; | ||
| std::unordered_set<int> uSet{1, 2, 4}; | ||
| std::unordered_multimap<int, int> uMMap{{1, 2}, {1, 1}, {2, 4}}; | ||
| std::unordered_multiset<int> uMSet{1, 1, 2}; | ||
| std::deque<int> deque{1, 2, 3}; | ||
| std::vector<int> vec{1, 2, 3}; | ||
| return 0; // break here | ||
| } | ||
|
|
||
| #--- commands.input | ||
|
|
||
| br s -p "break here" | ||
| r | ||
|
|
||
| fr v sp | ||
| fr v wp | ||
| fr v unique | ||
| # FIXME: _Has_value is put into the anonymous union along with _Value | ||
| # fr v opt | ||
| fr v str | ||
| fr v u8str | ||
| fr v wStr | ||
| fr v tuple | ||
| fr v map | ||
| fr v mapIt | ||
| fr v set | ||
| fr v mMap | ||
| fr v mSet | ||
| fr v variant | ||
| fr v list | ||
| fr v fwList | ||
| fr v uMap | ||
| fr v uSet | ||
| fr v uMMap | ||
| fr v uMSet | ||
| # FIXME: Static _Block_size is found but doesn't have a value | ||
| # fr v deque | ||
| fr v vec | ||
|
|
||
| quit | ||
|
|
||
| # CHECK: (lldb) fr v sp | ||
| # CHECK-NEXT: (std::shared_ptr<int>) sp = 41 strong=1 weak=1 { | ||
| # CHECK-NEXT: pointer = 0x{{.*}} | ||
| # CHECK-NEXT: } | ||
| # CHECK-NEXT: (lldb) fr v wp | ||
| # CHECK-NEXT: (std::weak_ptr<int>) wp = 41 strong=1 weak=1 { | ||
| # CHECK-NEXT: pointer = 0x{{.*}} | ||
| # CHECK-NEXT: } | ||
| # CHECK-NEXT: (lldb) fr v unique | ||
| # CHECK-NEXT: (std::unique_ptr<int, std::default_delete<int>>) unique = 42 { | ||
| # CHECK-NEXT: pointer = 0x{{.*}} | ||
| # CHECK-NEXT: } | ||
| # CHECK-NEXT: (lldb) fr v str | ||
| # CHECK-NEXT: (std::basic_string<char, std::char_traits<char>, std::allocator<char>>) str = "str" | ||
| # CHECK-NEXT: (lldb) fr v u8str | ||
| # CHECK-NEXT: (std::basic_string<char8_t, std::char_traits<char8_t>, std::allocator<char8_t>>) u8str = u8"str" | ||
| # CHECK-NEXT: (lldb) fr v wStr | ||
| # CHECK-NEXT: (std::basic_string<wchar_t, std::char_traits<wchar_t>, std::allocator<wchar_t>>) wStr = L"wstr" | ||
| # CHECK-NEXT: (lldb) fr v tuple | ||
| # CHECK-NEXT: (std::tuple<int, bool, float>) tuple = size=3 { | ||
| # CHECK-NEXT: [0] = 1 | ||
| # CHECK-NEXT: [1] = false | ||
| # CHECK-NEXT: [2] = 4.{{.*}} | ||
| # CHECK-NEXT: } | ||
| # CHECK-NEXT: (lldb) fr v map | ||
| # CHECK-NEXT: (std::map<int, int, std::less<int>, std::allocator<std::pair<int const, int>>>) map = size=3 { | ||
| # CHECK-NEXT: [0] = (first = 1, second = 2) | ||
| # CHECK-NEXT: [1] = (first = 2, second = 4) | ||
| # CHECK-NEXT: [2] = (first = 3, second = 6) | ||
| # CHECK-NEXT: } | ||
| # CHECK-NEXT: (lldb) fr v mapIt | ||
| # CHECK-NEXT: (std::_Tree_iterator<std::_Tree_val<std::_Tree_simple_types<std::pair<int const, int>>>>) mapIt = { | ||
| # CHECK-NEXT: first = 3 | ||
| # CHECK-NEXT: second = 6 | ||
| # CHECK-NEXT: } | ||
| # CHECK-NEXT: (lldb) fr v set | ||
| # CHECK-NEXT: (std::set<int, std::less<int>, std::allocator<int>>) set = size=3 { | ||
| # CHECK-NEXT: [0] = 1 | ||
| # CHECK-NEXT: [1] = 2 | ||
| # CHECK-NEXT: [2] = 3 | ||
| # CHECK-NEXT: } | ||
| # CHECK-NEXT: (lldb) fr v mMap | ||
| # CHECK-NEXT: (std::multimap<int, int, std::less<int>, std::allocator<std::pair<int const, int>>>) mMap = size=3 { | ||
| # CHECK-NEXT: [0] = (first = 1, second = 2) | ||
| # CHECK-NEXT: [1] = (first = 1, second = 1) | ||
| # CHECK-NEXT: [2] = (first = 2, second = 4) | ||
| # CHECK-NEXT: } | ||
| # CHECK-NEXT: (lldb) fr v mSet | ||
| # CHECK-NEXT: (std::multiset<int, std::less<int>, std::allocator<int>>) mSet = size=3 { | ||
| # CHECK-NEXT: [0] = 1 | ||
| # CHECK-NEXT: [1] = 2 | ||
| # CHECK-NEXT: [2] = 3 | ||
| # CHECK-NEXT: } | ||
| # CHECK-NEXT: (lldb) fr v variant | ||
| # CHECK-NEXT: (std::variant<int, float, std::basic_string<char, std::char_traits<char>, std::allocator<char>>, std::monostate>) variant = Active Type = std::basic_string<char, std::char_traits<char>, std::allocator<char>> { | ||
| # CHECK-NEXT: Value = "wow" | ||
| # CHECK-NEXT: } | ||
| # CHECK-NEXT: (lldb) fr v list | ||
| # CHECK-NEXT: (std::list<int, std::allocator<int>>) list = size=3 { | ||
| # CHECK-NEXT: [0] = 1 | ||
| # CHECK-NEXT: [1] = 2 | ||
| # CHECK-NEXT: [2] = 3 | ||
| # CHECK-NEXT: } | ||
| # CHECK-NEXT: (lldb) fr v fwList | ||
| # CHECK-NEXT: (std::forward_list<int, std::allocator<int>>) fwList = size=3 { | ||
| # CHECK-NEXT: [0] = 1 | ||
| # CHECK-NEXT: [1] = 2 | ||
| # CHECK-NEXT: [2] = 3 | ||
| # CHECK-NEXT: } | ||
| # CHECK-NEXT: (lldb) fr v uMap | ||
| # CHECK-NEXT: (std::unordered_map<int, int, std::hash<int>, std::equal_to<int>, std::allocator<std::pair<int const, int>>>) uMap = size=3 { | ||
| # CHECK-NEXT: [0] = (first = 1, second = 2) | ||
| # CHECK-NEXT: [1] = (first = 2, second = 4) | ||
| # CHECK-NEXT: [2] = (first = 3, second = 6) | ||
| # CHECK-NEXT: } | ||
| # CHECK-NEXT: (lldb) fr v uSet | ||
| # CHECK-NEXT: (std::unordered_set<int, std::hash<int>, std::equal_to<int>, std::allocator<int>>) uSet = size=3 { | ||
| # CHECK-NEXT: [0] = 1 | ||
| # CHECK-NEXT: [1] = 2 | ||
| # CHECK-NEXT: [2] = 4 | ||
| # CHECK-NEXT: } | ||
| # CHECK-NEXT: (lldb) fr v uMMap | ||
| # CHECK-NEXT: (std::unordered_multimap<int, int, std::hash<int>, std::equal_to<int>, std::allocator<std::pair<int const, int>>>) uMMap = size=3 { | ||
| # CHECK-NEXT: [0] = (first = 1, second = 2) | ||
| # CHECK-NEXT: [1] = (first = 1, second = 1) | ||
| # CHECK-NEXT: [2] = (first = 2, second = 4) | ||
| # CHECK-NEXT: } | ||
| # CHECK-NEXT: (lldb) fr v uMSet | ||
| # CHECK-NEXT: (std::unordered_multiset<int, std::hash<int>, std::equal_to<int>, std::allocator<int>>) uMSet = size=3 { | ||
| # CHECK-NEXT: [0] = 1 | ||
| # CHECK-NEXT: [1] = 1 | ||
| # CHECK-NEXT: [2] = 2 | ||
| # CHECK-NEXT: } | ||
| # CHECK-NEXT: (lldb) fr v vec | ||
| # CHECK-NEXT: (std::vector<int, std::allocator<int>>) vec = size=3 { | ||
| # CHECK-NEXT: [0] = 1 | ||
| # CHECK-NEXT: [1] = 2 | ||
| # CHECK-NEXT: [2] = 3 | ||
| # CHECK-NEXT: } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Instead of having these shell tests can we just mark the relevant formatters with the
pdbcategories introduced in #149305? Maybe that was already your plan :)There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yea, that was my plan. Once that's merged, I'll update the tests.