OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 6
Code Issues Packages Projects Releases Wiki Activity

Make sure breakpoint partial name matches occur on namespace boundaries. 

<rdar://problem/10720345> "break set -n" name matching should only match at namespace boundaries

llvm-svn: 151876
This commit is contained in:
Jim Ingham 2012-03-02 02:24:42 +00:00
parent 1df94bfe8a
commit 85c13d788d
1 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
View File

@ -2908,8 +2908,41 @@ SymbolFileDWARF::FunctionDieMatchesPartialName (const DWARFDebugInfoEntry* die,
if (demangled)
{
std::string name_no_parens(partial_name, base_name_end - partial_name);
if (strstr (demangled, name_no_parens.c_str()) == NULL)
const char *partial_in_demangled = strstr (demangled, name_no_parens.c_str());
if (partial_in_demangled == NULL)
return false;
else
{
// Sort out the case where our name is something like "Process::Destroy" and the match is
// "SBProcess::Destroy" - that shouldn't be a match. We should really always match on
// namespace boundaries...
if (partial_name[0] == ':' && partial_name[1] == ':')
{
// The partial name was already on a namespace boundary so all matches are good.
return true;
}
else if (partial_in_demangled == demangled)
{
// They both start the same, so this is an good match.
return true;
}
else
{
if (partial_in_demangled - demangled == 1)
{
// Only one character difference, can't be a namespace boundary...
return false;
}
else if (*(partial_in_demangled - 1) == ':' && *(partial_in_demangled - 2) == ':')
{
// We are on a namespace boundary, so this is also good.
return true;
}
else
return false;
}
}
}
}
}