replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove old compatibility APIs, use StringRef versions instead. 

llvm-svn: 119935
This commit is contained in:
Chris Lattner 2010-11-21 09:55:08 +00:00
parent 0c0e80408a
commit 8afa6deb1d
5 changed files with 11 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
clang/include/clang/Basic/FileManager.h
View File

@ -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

2
clang/lib/Lex/HeaderMap.cpp
View File

@ -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);
}
}

20
clang/lib/Lex/HeaderSearch.cpp
View File

@ -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;
}

4
clang/lib/Serialization/ASTReader.cpp
View File

@ -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

3
clang/tools/libclang/CIndex.cpp
View File

@ -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);
}