remove old compatibility APIs, use StringRef versions instead.

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

diff --git a/include/clang/Basic/FileManager.h b/include/clang/Basic/FileManager.h
index 05a341331252c71c18dbe9abcc5eaabadd3e535d..7fd19d929690173933d3b3f770a42393a98351e9 100644 (file)
--- a/include/clang/Basic/FileManager.h
+++ b/include/clang/Basic/FileManager.h
@@ -198,23 +198,12 @@ public:
   ///
   const DirectoryEntry *getDirectory(llvm::StringRef Filename,
                                      const FileSystemOptions &FileSystemOpts);
-  const DirectoryEntry *getDirectory(const char *FileStart,const char *FileEnd,
-                                     const FileSystemOptions &FileSystemOpts) {
-    return getDirectory(llvm::StringRef(FileStart, FileEnd-FileStart),
-                        FileSystemOpts);
-  }
 
   /// getFile - Lookup, cache, and verify the specified file.  This returns null
   /// if the file doesn't exist.
   ///
   const FileEntry *getFile(llvm::StringRef Filename,
                            const FileSystemOptions &FileSystemOpts);
-  const FileEntry *getFile(const char *FilenameStart,
-                           const char *FilenameEnd,
-                           const FileSystemOptions &FileSystemOpts) {
-    return getFile(llvm::StringRef(FilenameStart, FilenameEnd-FilenameStart),
-                   FileSystemOpts);
-  }
 
   /// \brief Retrieve a file entry for a "virtual" file that acts as
   /// if there were a file with the given name on disk. The file

diff --git a/lib/Lex/HeaderMap.cpp b/lib/Lex/HeaderMap.cpp
index 5d9b218a7d8abc18b54a69a67ffb0c2c7c596324..d5d7e4b9bb26f14272d783f3f52cdcb76adb68fa 100644 (file)
--- a/lib/Lex/HeaderMap.cpp
+++ b/lib/Lex/HeaderMap.cpp
@@ -225,6 +225,6 @@ const FileEntry *HeaderMap::LookupFile(llvm::StringRef Filename,
     llvm::SmallString<1024> DestPath;
     DestPath += getString(B.Prefix);
     DestPath += getString(B.Suffix);
-    return FM.getFile(DestPath.begin(), DestPath.end(), FileSystemOpts);
+    return FM.getFile(DestPath.str(), FileSystemOpts);
   }
 }

diff --git a/lib/Lex/HeaderSearch.cpp b/lib/Lex/HeaderSearch.cpp
index 5a11652fc1d654e77d96fecc7d249e8bda041c97..ee6c4c6a8c06fed478f9597b63996ba4a4b0b105 100644 (file)
--- a/lib/Lex/HeaderSearch.cpp
+++ b/lib/Lex/HeaderSearch.cpp
@@ -119,8 +119,7 @@ const FileEntry *DirectoryLookup::LookupFile(llvm::StringRef Filename,
     TmpDir += getDir()->getName();
     TmpDir.push_back('/');
     TmpDir.append(Filename.begin(), Filename.end());
-    return HS.getFileMgr().getFile(TmpDir.begin(), TmpDir.end(),
-                                   HS.getFileSystemOpts());
+    return HS.getFileMgr().getFile(TmpDir.str(), HS.getFileSystemOpts());
   }
 
   if (isFramework())
@@ -187,8 +186,7 @@ const FileEntry *DirectoryLookup::DoFrameworkLookup(llvm::StringRef Filename,
 
   FrameworkName += "Headers/";
   FrameworkName.append(Filename.begin()+SlashPos+1, Filename.end());
-  if (const FileEntry *FE = FileMgr.getFile(FrameworkName.begin(),
-                                            FrameworkName.end(),
+  if (const FileEntry *FE = FileMgr.getFile(FrameworkName.str(),
                                             FileSystemOpts)) {
     return FE;
   }
@@ -197,8 +195,7 @@ const FileEntry *DirectoryLookup::DoFrameworkLookup(llvm::StringRef Filename,
   const char *Private = "Private";
   FrameworkName.insert(FrameworkName.begin()+OrigSize, Private,
                        Private+strlen(Private));
-  return FileMgr.getFile(FrameworkName.begin(), FrameworkName.end(),
-                         FileSystemOpts);
+  return FileMgr.getFile(FrameworkName.str(), FileSystemOpts);
 }
 
 
@@ -335,7 +332,7 @@ LookupSubframeworkHeader(llvm::StringRef Filename,
   FrameworkName += ".framework/";
 
   llvm::StringMapEntry<const DirectoryEntry *> &CacheLookup =
-    FrameworkMap.GetOrCreateValue(Filename.begin(), Filename.begin()+SlashPos);
+    FrameworkMap.GetOrCreateValue(Filename.substr(0, SlashPos));
 
   // Some other location?
   if (CacheLookup.getValue() &&
@@ -349,8 +346,7 @@ LookupSubframeworkHeader(llvm::StringRef Filename,
     ++NumSubFrameworkLookups;
 
     // If the framework dir doesn't exist, we fail.
-    const DirectoryEntry *Dir = FileMgr.getDirectory(FrameworkName.begin(),
-                                                     FrameworkName.end(),
+    const DirectoryEntry *Dir = FileMgr.getDirectory(FrameworkName.str(),
                                                      FileSystemOpts);
     if (Dir == 0) return 0;
 
@@ -365,15 +361,13 @@ LookupSubframeworkHeader(llvm::StringRef Filename,
   llvm::SmallString<1024> HeadersFilename(FrameworkName);
   HeadersFilename += "Headers/";
   HeadersFilename.append(Filename.begin()+SlashPos+1, Filename.end());
-  if (!(FE = FileMgr.getFile(HeadersFilename.begin(),
-                             HeadersFilename.end(), FileSystemOpts))) {
+  if (!(FE = FileMgr.getFile(HeadersFilename.str(), FileSystemOpts))) {
 
     // Check ".../Frameworks/HIToolbox.framework/PrivateHeaders/HIToolbox.h"
     HeadersFilename = FrameworkName;
     HeadersFilename += "PrivateHeaders/";
     HeadersFilename.append(Filename.begin()+SlashPos+1, Filename.end());
-    if (!(FE = FileMgr.getFile(HeadersFilename.begin(), HeadersFilename.end(),
-                               FileSystemOpts)))
+    if (!(FE = FileMgr.getFile(HeadersFilename.str(), FileSystemOpts)))
       return 0;
   }
 

diff --git a/lib/Serialization/ASTReader.cpp b/lib/Serialization/ASTReader.cpp
index 68f8b539eb825bcffe8003ef340772852e9dce44..9e3e0773bfd66ec69a1eab8d5fb9e1c8a63eea00 100644 (file)
--- a/lib/Serialization/ASTReader.cpp
+++ b/lib/Serialization/ASTReader.cpp
@@ -1548,8 +1548,8 @@ void ASTReader::ReadMacroRecord(PerFileData &F, uint64_t Offset) {
 
       const char *FullFileNameStart = BlobStart + Record[3];
       const FileEntry *File
-        = PP->getFileManager().getFile(FullFileNameStart,
-                                     FullFileNameStart + (BlobLen - Record[3]),
+      = PP->getFileManager().getFile(llvm::StringRef(FullFileNameStart,
+                                                     BlobLen - Record[3]),
                                      FileSystemOpts);
 
       // FIXME: Stable encoding

diff --git a/tools/libclang/CIndex.cpp b/tools/libclang/CIndex.cpp
index 2eb2096fc9ee839eebccf1f8485dd7e189532e03..55331f6db41071ac36eb7c7f616e2971eeec7217 100644 (file)
--- a/tools/libclang/CIndex.cpp
+++ b/tools/libclang/CIndex.cpp
@@ -2584,8 +2584,7 @@ CXFile clang_getFile(CXTranslationUnit tu, const char *file_name) {
   ASTUnit *CXXUnit = static_cast<ASTUnit *>(tu->TUData);
 
   FileManager &FMgr = CXXUnit->getFileManager();
-  const FileEntry *File = FMgr.getFile(file_name, file_name+strlen(file_name),
-                                       CXXUnit->getFileSystemOpts());
+  const FileEntry *File = FMgr.getFile(file_name, CXXUnit->getFileSystemOpts());
   return const_cast<FileEntry *>(File);
 }