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

Merge remote-tracking branch 'origin/4.13' into master

Browse Source 
Change-Id: I8b11dad770b37a7f6029ae818c9d92a24818e56d
This commit is contained in:
Eike Ziller
2020-08-26 13:12:21 +02:00
parent 8cf1b598fe 29ecf16ed3
commit 6efb09a86a
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
share/qtcreator/debugger/stdtypes.py
View File

@@ -695,13 +695,15 @@ def qdumpHelper_std__string(d, value, charType, format):
# GCC 9, QTCREATORBUG-22753 # GCC 9, QTCREATORBUG-22753
try: try:
data = value["_M_dataplus"]["_M_p"].pointer() data = value["_M_dataplus"]["_M_p"].pointer()
except:
data = value.extractPointer()
try:
size = int(value["_M_string_length"]) size = int(value["_M_string_length"])
d.putCharArrayHelper(data, size, charType, format) d.putCharArrayHelper(data, size, charType, format)
return return
except: except:
pass pass
data = value.extractPointer()
# We can't lookup the std::string::_Rep type without crashing LLDB, # We can't lookup the std::string::_Rep type without crashing LLDB,
# so hard-code assumption on member position # so hard-code assumption on member position
# struct { size_type _M_length, size_type _M_capacity, int _M_refcount; } # struct { size_type _M_length, size_type _M_capacity, int _M_refcount; }