FileNameMatchTrie: Use StringRef instead of Twines where possible.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@165412 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang/Tooling/FileMatchTrie.h b/include/clang/Tooling/FileMatchTrie.h
index 14c823ba5ec61afff03e99032a717a2c45ab493a..ff988bebf2ca3b860575755d75c5e83f0d2fe2f0 100644 (file)
--- a/include/clang/Tooling/FileMatchTrie.h
+++ b/include/clang/Tooling/FileMatchTrie.h
@@ -18,7 +18,6 @@
 #include "clang/Basic/LLVM.h"
 #include "llvm/ADT/OwningPtr.h"
 #include "llvm/ADT/StringRef.h"
-#include "llvm/ADT/Twine.h"
 
 #include <string>
 #include <vector>
@@ -28,7 +27,7 @@ namespace tooling {
 
 struct PathComparator {
   virtual ~PathComparator() {}
-  virtual bool equivalent(const Twine &FileA, const Twine &FileB) const = 0;
+  virtual bool equivalent(StringRef FileA, StringRef FileB) const = 0;
 };
 class FileMatchTrieNode;
 

diff --git a/lib/Tooling/FileMatchTrie.cpp b/lib/Tooling/FileMatchTrie.cpp
index b16b044245affa8c8848d1069710fa15d13909dc..9b1be62875a827a8429c1f603112d47fe31bbef7 100644 (file)
--- a/lib/Tooling/FileMatchTrie.cpp
+++ b/lib/Tooling/FileMatchTrie.cpp
@@ -23,9 +23,8 @@ namespace tooling {
 /// \brief Default \c PathComparator using \c llvm::sys::fs::equivalent().
 struct DefaultPathComparator : public PathComparator {
   virtual ~DefaultPathComparator() {}
-  virtual bool equivalent(const Twine &FileA, const Twine &FileB) const {
-    return FileA.str() == FileB.str() ||
-        llvm::sys::fs::equivalent(FileA, FileB);
+  virtual bool equivalent(StringRef FileA, StringRef FileB) const {
+    return FileA == FileB || llvm::sys::fs::equivalent(FileA, FileB);
   }
 };
 

diff --git a/unittests/Tooling/CompilationDatabaseTest.cpp b/unittests/Tooling/CompilationDatabaseTest.cpp
index 5bbbe2aa2e73ac8b308806e9247742bf686d5828..6b58abbd3259c5a39d55863bc919bc45f731ca95 100644 (file)
--- a/unittests/Tooling/CompilationDatabaseTest.cpp
+++ b/unittests/Tooling/CompilationDatabaseTest.cpp
@@ -84,8 +84,8 @@ static CompileCommand findCompileArgsInJsonDatabase(StringRef FileName,
 
 struct FakeComparator : public PathComparator {
   virtual ~FakeComparator() {}
-  virtual bool equivalent(const Twine &FileA, const Twine &FileB) const {
-    return StringRef(FileA.str()).equals_lower(FileB.str());
+  virtual bool equivalent(StringRef FileA, StringRef FileB) const {
+    return FileA.equals_lower(FileB);
   }
 };