From 2e2468e2d2ccbb9a38fe3b6b754009af7e5d39a9 Mon Sep 17 00:00:00 2001 From: Anders Carlsson Date: Mon, 14 Mar 2011 01:13:54 +0000 Subject: [PATCH] Get rid of the static FileManager::FixupRelativePath. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@127573 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/Basic/FileManager.h | 3 --- lib/Basic/FileManager.cpp | 12 ++++-------- lib/Frontend/CompilerInstance.cpp | 2 +- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/include/clang/Basic/FileManager.h b/include/clang/Basic/FileManager.h index d14371d7a8..57f7d71660 100644 --- a/include/clang/Basic/FileManager.h +++ b/include/clang/Basic/FileManager.h @@ -197,9 +197,6 @@ public: /// \brief If path is not absolute and FileSystemOptions set the working /// directory, the path is modified to be relative to the given /// working directory. - static void FixupRelativePath(llvm::SmallVectorImpl &path, - const FileSystemOptions &FSOpts); - void FixupRelativePath(llvm::SmallVectorImpl &path) const; /// \brief Produce an array mapping from the unique IDs assigned to each diff --git a/lib/Basic/FileManager.cpp b/lib/Basic/FileManager.cpp index add4ec00b1..6512d76aae 100644 --- a/lib/Basic/FileManager.cpp +++ b/lib/Basic/FileManager.cpp @@ -450,22 +450,18 @@ FileManager::getVirtualFile(llvm::StringRef Filename, off_t Size, return UFE; } -void FileManager::FixupRelativePath(llvm::SmallVectorImpl &path, - const FileSystemOptions &FSOpts) { +void FileManager::FixupRelativePath(llvm::SmallVectorImpl &path) const { llvm::StringRef pathRef(path.data(), path.size()); - if (FSOpts.WorkingDir.empty() || llvm::sys::path::is_absolute(pathRef)) + if (FileSystemOpts.WorkingDir.empty() + || llvm::sys::path::is_absolute(pathRef)) return; - llvm::SmallString<128> NewPath(FSOpts.WorkingDir); + llvm::SmallString<128> NewPath(FileSystemOpts.WorkingDir); llvm::sys::path::append(NewPath, pathRef); path = NewPath; } -void FileManager::FixupRelativePath(llvm::SmallVectorImpl &path) const { - FixupRelativePath(path, FileSystemOpts); -} - llvm::MemoryBuffer *FileManager:: getBufferForFile(const FileEntry *Entry, std::string *ErrorStr) { llvm::OwningPtr Result; diff --git a/lib/Frontend/CompilerInstance.cpp b/lib/Frontend/CompilerInstance.cpp index 70d6fef295..b47da312a1 100644 --- a/lib/Frontend/CompilerInstance.cpp +++ b/lib/Frontend/CompilerInstance.cpp @@ -370,7 +370,7 @@ void CompilerInstance::clearOutputFiles(bool EraseFiles) { // If '-working-directory' was passed, the output filename should be // relative to that. - FileManager::FixupRelativePath(NewOutFile, getFileSystemOpts()); + FileMgr->FixupRelativePath(NewOutFile); if (llvm::error_code ec = llvm::sys::fs::rename(it->TempFilename, NewOutFile.str())) { getDiagnostics().Report(diag::err_fe_unable_to_rename_temp) -- 2.40.0