give FileManager a 'FileSystemOptions' ivar, which will be used
to simplify a bunch of code in it. It should ultimately get inlined
into FileManager.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@120007 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/clang/Basic/FileManager.h b/include/clang/Basic/FileManager.h
index 77eb1f4..d5d2da7 100644
--- a/include/clang/Basic/FileManager.h
+++ b/include/clang/Basic/FileManager.h
@@ -141,7 +141,8 @@
/// names (e.g. symlinked) will be treated as a single file.
///
class FileManager {
-
+ const FileSystemOptions &FileSystemOpts;
+
class UniqueDirContainer;
class UniqueFileContainer;
@@ -170,11 +171,10 @@
// Caching.
llvm::OwningPtr<StatSysCallCache> StatCache;
- int stat_cached(const char* path, struct stat* buf,
- const FileSystemOptions &FileSystemOpts);
+ int stat_cached(const char* path, struct stat* buf);
public:
- FileManager();
+ FileManager(const FileSystemOptions &FileSystemOpts);
~FileManager();
/// \brief Installs the provided StatSysCallCache object within
diff --git a/lib/Basic/FileManager.cpp b/lib/Basic/FileManager.cpp
index c8515a3..6b356b8 100644
--- a/lib/Basic/FileManager.cpp
+++ b/lib/Basic/FileManager.cpp
@@ -142,8 +142,9 @@
// Common logic.
//===----------------------------------------------------------------------===//
-FileManager::FileManager()
- : UniqueDirs(*new UniqueDirContainer),
+FileManager::FileManager(const FileSystemOptions &FSO)
+ : FileSystemOpts(FSO),
+ UniqueDirs(*new UniqueDirContainer),
UniqueFiles(*new UniqueFileContainer),
DirEntries(64), FileEntries(64), NextFileUID(0) {
NumDirLookups = NumFileLookups = 0;
@@ -250,7 +251,7 @@
// Check to see if the directory exists.
struct stat StatBuf;
- if (stat_cached(InterndDirName, &StatBuf, FileSystemOpts) || // Error stat'ing.
+ if (stat_cached(InterndDirName, &StatBuf) || // Error stat'ing.
!S_ISDIR(StatBuf.st_mode)) // Not a directory?
return 0;
@@ -309,7 +310,7 @@
// Nope, there isn't. Check to see if the file exists.
struct stat StatBuf;
//llvm::errs() << "STATING: " << Filename;
- if (stat_cached(InterndFileName, &StatBuf, FileSystemOpts) || // Error stat'ing.
+ if (stat_cached(InterndFileName, &StatBuf) || // Error stat'ing.
S_ISDIR(StatBuf.st_mode)) { // A directory?
// If this file doesn't exist, we leave a null in FileEntries for this path.
//llvm::errs() << ": Not existing\n";
@@ -375,7 +376,7 @@
// newly-created file entry.
const char *InterndFileName = NamedFileEnt.getKeyData();
struct stat StatBuf;
- if (!stat_cached(InterndFileName, &StatBuf, FileSystemOpts) &&
+ if (!stat_cached(InterndFileName, &StatBuf) &&
!S_ISDIR(StatBuf.st_mode)) {
llvm::sys::Path FilePath(InterndFileName);
FilePath.makeAbsolute();
@@ -408,8 +409,7 @@
return llvm::MemoryBuffer::getFile(FilePath.c_str(), ErrorStr, FileSize);
}
-int FileManager::stat_cached(const char *path, struct stat *buf,
- const FileSystemOptions &FileSystemOpts) {
+int FileManager::stat_cached(const char *path, struct stat *buf) {
if (FileSystemOpts.WorkingDir.empty())
return StatCache.get() ? StatCache->stat(path, buf) : stat(path, buf);
diff --git a/lib/Frontend/ASTUnit.cpp b/lib/Frontend/ASTUnit.cpp
index d590d69..cbcb08b 100644
--- a/lib/Frontend/ASTUnit.cpp
+++ b/lib/Frontend/ASTUnit.cpp
@@ -492,7 +492,7 @@
AST->CaptureDiagnostics = CaptureDiagnostics;
AST->Diagnostics = Diags;
AST->FileSystemOpts = FileSystemOpts;
- AST->FileMgr.reset(new FileManager);
+ AST->FileMgr.reset(new FileManager(FileSystemOpts));
AST->SourceMgr.reset(new SourceManager(AST->getDiagnostics(),
AST->getFileManager(),
AST->getFileSystemOpts()));
@@ -753,7 +753,7 @@
// Configure the various subsystems.
// FIXME: Should we retain the previous file manager?
- FileMgr.reset(new FileManager);
+ FileMgr.reset(new FileManager(Clang.getFileSystemOpts()));
FileSystemOpts = Clang.getFileSystemOpts();
SourceMgr.reset(new SourceManager(getDiagnostics(), *FileMgr, FileSystemOpts));
TheSema.reset();
@@ -1245,7 +1245,7 @@
TopLevelDeclsInPreamble.clear();
// Create a file manager object to provide access to and cache the filesystem.
- Clang.setFileManager(new FileManager);
+ Clang.setFileManager(new FileManager(Clang.getFileSystemOpts()));
// Create the source manager.
Clang.setSourceManager(new SourceManager(getDiagnostics(),
diff --git a/lib/Frontend/CompilerInstance.cpp b/lib/Frontend/CompilerInstance.cpp
index 6755274..0691770 100644
--- a/lib/Frontend/CompilerInstance.cpp
+++ b/lib/Frontend/CompilerInstance.cpp
@@ -148,7 +148,7 @@
// File Manager
void CompilerInstance::createFileManager() {
- FileMgr.reset(new FileManager());
+ FileMgr.reset(new FileManager(getFileSystemOpts()));
}
// Source Manager
diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp
index b1d6adb..b0c3036 100644
--- a/lib/Frontend/CompilerInvocation.cpp
+++ b/lib/Frontend/CompilerInvocation.cpp
@@ -1563,7 +1563,7 @@
// PCH file and find the original header name. Remove the need to do that in
// ParsePreprocessorArgs and remove the FileManager & FileSystemOptions
// parameters from the function and the "FileManager.h" #include.
- FileManager FileMgr;
+ FileManager FileMgr(Res.getFileSystemOpts());
ParsePreprocessorArgs(Res.getPreprocessorOpts(), *Args,
FileMgr, Res.getFileSystemOpts(), Diags);
ParsePreprocessorOutputArgs(Res.getPreprocessorOutputOpts(), *Args);
diff --git a/tools/libclang/CIndexCodeCompletion.cpp b/tools/libclang/CIndexCodeCompletion.cpp
index 01c855e..60c9e19 100644
--- a/tools/libclang/CIndexCodeCompletion.cpp
+++ b/tools/libclang/CIndexCodeCompletion.cpp
@@ -247,7 +247,8 @@
/// with the code-completion results.
std::vector<llvm::sys::Path> TemporaryFiles;
- /// \brief Temporary buffers that will be deleted once we have finished with the code-completion results.
+ /// \brief Temporary buffers that will be deleted once we have finished with
+ /// the code-completion results.
llvm::SmallVector<const llvm::MemoryBuffer *, 1> TemporaryBuffers;
};
@@ -261,6 +262,7 @@
: CXCodeCompleteResults(),
Diag(new Diagnostic(
llvm::IntrusiveRefCntPtr<DiagnosticIDs>(new DiagnosticIDs))),
+ FileMgr(FileSystemOpts),
SourceMgr(*Diag, FileMgr, FileSystemOpts) {
if (getenv("LIBCLANG_OBJTRACKING")) {
++CodeCompletionResultObjects;