maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Improve LLDB's embedded C++ demangler by addressing the following two issues: 

1) Preserve ref qualification state in a local variable while parsing a nested name.  Previously, the state was recorded in the shared db reference and could therefore be overwritten when parsing multiple levels of nested names (e.g.: when a qualified name has qualified template args.)

2) Address an off-by-one error when testing whether or not a thunk is non-virtual.  This resulted in the demangled identifying all thunks as non-virtual.

llvm-svn: 213591
This commit is contained in:
Kate Stone 2014-07-22 00:18:52 +00:00
parent d6906e4ffe
commit bb1321a7be
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lldb/source/Core/Mangled.cpp
View File

@ -3932,15 +3932,15 @@ parse_nested_name(const char* first, const char* last, C& db)
const char* t0 = parse_cv_qualifiers(first+1, last, cv);
if (t0 == last)
return first;
db.ref = 0;
unsigned ref = 0;
if (*t0 == 'R')
{
db.ref = 1;
ref = 1;
++t0;
}
else if (*t0 == 'O')
{
db.ref = 2;
ref = 2;
++t0;
}
db.names.emplace_back();
@ -4054,6 +4054,7 @@ parse_nested_name(const char* first, const char* last, C& db)
}
}
first = t0 + 1;
db.ref = ref;
db.cv = cv;
if (pop_subs && !db.subs.empty())
db.subs.pop_back();
@ -4413,7 +4414,7 @@ parse_special_name(const char* first, const char* last, C& db)
{
if (db.names.empty())
return first;
if (first[2] == 'v')
if (first[1] == 'v')
{
db.names.back().first.insert(0, "virtual thunk to ");
first = t;