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

In FileSpec::Equal, short-cut GetNormalizedPath. 

GetNormalizedPath seems to be slow, so it's worth
shortcutting it if possible.  This change does so
when the filenames and not equal and we can tell
GetNormalizedPath would not make them equal.

Also added a test for "." final component since that
was missing.

llvm-svn: 298876
This commit is contained in:
Jim Ingham 2017-03-27 19:12:25 +00:00
parent 46a0392c61
commit 97e4f472c3
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lldb/source/Utility/FileSpec.cpp
View File

@ -401,11 +401,36 @@ int FileSpec::Compare(const FileSpec &a, const FileSpec &b, bool full) {
bool FileSpec::Equal(const FileSpec &a, const FileSpec &b, bool full,
bool remove_backups) {
static ConstString g_dot_string(".");
static ConstString g_dot_dot_string("..");
// case sensitivity of equality test
const bool case_sensitive = a.IsCaseSensitive() || b.IsCaseSensitive();
bool filenames_equal = ConstString::Equals(a.m_filename,
b.m_filename,
case_sensitive);
// The only way two FileSpecs can be equal if their filenames are
// unequal is if we are removing backups and one or the other filename
// is a backup string:
if (!filenames_equal && !remove_backups)
return false;
bool last_component_is_dot = ConstString::Equals(a.m_filename, g_dot_string)
|| ConstString::Equals(a.m_filename,
g_dot_dot_string)
|| ConstString::Equals(b.m_filename,
g_dot_string)
|| ConstString::Equals(b.m_filename,
g_dot_dot_string);
if (!filenames_equal && !last_component_is_dot)
return false;
if (!full && (a.GetDirectory().IsEmpty() || b.GetDirectory().IsEmpty()))
return ConstString::Equals(a.m_filename, b.m_filename, case_sensitive);
return filenames_equal;
if (remove_backups == false)
return a == b;

2
lldb/unittests/Host/FileSpecTest.cpp
View File

@ -164,6 +164,7 @@ TEST(FileSpecTest, EqualDotsWindows) {
{R"(C:/bar/baz)", R"(C:\foo\..\bar\baz)"},
{R"(C:\bar)", R"(C:\foo\..\bar)"},
{R"(C:\foo\bar)", R"(C:\foo\.\bar)"},
{R"(C:\foo\bar)", R"(C:\foo\bar\.)"},
};
for(const auto &test: tests) {
@ -187,6 +188,7 @@ TEST(FileSpecTest, EqualDotsPosix) {
{R"(/bar/baz)", R"(/foo/../bar/baz)"},
{R"(/bar)", R"(/foo/../bar)"},
{R"(/foo/bar)", R"(/foo/./bar)"},
{R"(/foo/bar)", R"(/foo/bar/.)"},
};
for(const auto &test: tests) {