feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Adds boost 1.79 dumpers

Browse Source 
Change-Id: I2111b91fe8914afdde54edd6009691dfe32e64a4
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Marcus Tillmanns
2022-08-18 11:06:48 +02:00
parent c0a0daf588
commit 8b143be86c
2 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
share/qtcreator/debugger/boosttypes.py
View File

@@ -139,7 +139,10 @@ def qdump__boost__posix_time__time_duration(d, value):
def qdump__boost__unordered__unordered_set(d, value): def qdump__boost__unordered__unordered_set(d, value):
innerType = value.type[0] innerType = value.type[0]
if value.type.size() == 6 * d.ptrSize(): # 48 for boost 1.55+, 40 for 1.48 if value.type.size() == 7 * d.ptrSize(): # 56 for boost 1.79+
bases, bucketCount, bcountLog2, size, mlf, maxload, buckets = value.split('ttttttp')
forward = True
elif value.type.size() == 6 * d.ptrSize(): # 48 for boost 1.55+
# boost 1.58 or 1.55 # boost 1.58 or 1.55
# bases are 3? bytes, and mlf is actually a float, but since # bases are 3? bytes, and mlf is actually a float, but since
# its followed by size_t maxload, it's # effectively padded to a size_t # its followed by size_t maxload, it's # effectively padded to a size_t
@@ -150,14 +153,16 @@ def qdump__boost__unordered__unordered_set(d, value):
forward = len(ittype.templateArguments()) == 1 forward = len(ittype.templateArguments()) == 1
except: except:
forward = True forward = True
else: elif value.type.size() == 5 * d.ptrSize(): # 40 for boost 1.48
# boost 1.48 # boost 1.48
# Values are stored before the next pointers. Determine the offset. # Values are stored before the next pointers. Determine the offset.
buckets, bucketCount, size, mlf, maxload = value.split('ptttt') buckets, bucketCount, size, mlf, maxload = value.split('ptttt')
forward = False forward = False
else:
raise Exception("Unknown boost::unordered_set layout")
if forward: if forward:
# boost 1.58 # boost >= 1.58
code = 'pp{%s}' % innerType.name code = 'pp{%s}' % innerType.name
def children(p): def children(p):
@@ -174,6 +179,7 @@ def qdump__boost__unordered__unordered_set(d, value):
while True: while True:
val, pad, p = d.split(code, p - offset) val, pad, p = d.split(code, p - offset)
yield val yield val
p = d.extractPointer(buckets + bucketCount * d.ptrSize()) p = d.extractPointer(buckets + bucketCount * d.ptrSize())
d.putItems(size, children(p), maxNumChild=10000) d.putItems(size, children(p), maxNumChild=10000)

13
tests/auto/debugger/tst_dumpers.cpp
View File

@@ -6782,7 +6782,9 @@ void tst_Dumpers::dumper_data()
QTest::newRow("BoostList") QTest::newRow("BoostList")
<< Data("#include <boost/container/list.hpp>\n", << Data("#include <utility>\n"
"#include <boost/container/list.hpp>\n"
"#include <boost/container/detail/pair.hpp>\n",
"typedef std::pair<int, double> p;\n" "typedef std::pair<int, double> p;\n"
"boost::container::list<p> l;\n" "boost::container::list<p> l;\n"
"l.push_back(p(13, 61));\n" "l.push_back(p(13, 61));\n"
@@ -6797,7 +6799,8 @@ void tst_Dumpers::dumper_data()
QTest::newRow("BoostVector") QTest::newRow("BoostVector")
<< Data("#include <boost/container/vector.hpp>\n", << Data("#include <utility>\n"
"#include <boost/container/vector.hpp>\n",
"typedef std::pair<int, double> p;\n" "typedef std::pair<int, double> p;\n"
"boost::container::vector<p> v;\n" "boost::container::vector<p> v;\n"
"v.push_back(p(13, 61));\n" "v.push_back(p(13, 61));\n"
@@ -6812,7 +6815,8 @@ void tst_Dumpers::dumper_data()
QTest::newRow("BoostStaticVector") QTest::newRow("BoostStaticVector")
<< Data("#include <boost/container/static_vector.hpp>\n", << Data("#include <utility>\n"
"#include <boost/container/static_vector.hpp>\n",
"typedef std::pair<int, double> p;\n" "typedef std::pair<int, double> p;\n"
"boost::container::static_vector<p, 10> v;\n" "boost::container::static_vector<p, 10> v;\n"
"v.push_back(p(13, 61));\n" "v.push_back(p(13, 61));\n"
@@ -6827,7 +6831,8 @@ void tst_Dumpers::dumper_data()
QTest::newRow("BoostSmallVector") QTest::newRow("BoostSmallVector")
<< Data("#include <boost/container/small_vector.hpp>\n", << Data("#include <utility>\n"
"#include <boost/container/small_vector.hpp>\n",
"typedef std::pair<int, double> p;\n" "typedef std::pair<int, double> p;\n"
"boost::container::small_vector<p, 3> v0;\n" "boost::container::small_vector<p, 3> v0;\n"
"boost::container::small_vector<p, 3> v2;\n" "boost::container::small_vector<p, 3> v2;\n"