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

[Basic/FileManager] Propagate whether a file 'IsVolatile' to the file opening functions. 

Needs llvm r208007.

llvm-svn: 208008
This commit is contained in:
Argyrios Kyrtzidis 2014-05-05 21:57:46 +00:00
parent 20a92ae3d2
commit 26d56393c6
3 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
clang/include/clang/Basic/VirtualFileSystem.h
View File

@ -86,7 +86,8 @@ public:
/// \brief Get the contents of the file as a \p MemoryBuffer.
virtual llvm::error_code
getBuffer(const Twine &Name, std::unique_ptr<llvm::MemoryBuffer> &Result,
int64_t FileSize = -1, bool RequiresNullTerminator = true) = 0;
int64_t FileSize = -1, bool RequiresNullTerminator = true,
bool IsVolatile = false) = 0;
/// \brief Closes the file.
virtual llvm::error_code close() = 0;
/// \brief Sets the name to use for this file.
@ -109,7 +110,8 @@ public:
llvm::error_code getBufferForFile(const Twine &Name,
std::unique_ptr<llvm::MemoryBuffer> &Result,
int64_t FileSize = -1,
bool RequiresNullTerminator = true);
bool RequiresNullTerminator = true,
bool IsVolatile = false);
};
/// \brief Gets an \p vfs::FileSystem for the 'real' file system, as seen by

9
clang/lib/Basic/FileManager.cpp
View File

@ -391,7 +391,8 @@ getBufferForFile(const FileEntry *Entry, std::string *ErrorStr,
const char *Filename = Entry->getName();
// If the file is already open, use the open file descriptor.
if (Entry->File) {
ec = Entry->File->getBuffer(Filename, Result, FileSize);
ec = Entry->File->getBuffer(Filename, Result, FileSize,
/*RequiresNullTerminator=*/true, isVolatile);
if (ErrorStr)
*ErrorStr = ec.message();
Entry->closeFile();
@ -401,7 +402,8 @@ getBufferForFile(const FileEntry *Entry, std::string *ErrorStr,
// Otherwise, open the file.
if (FileSystemOpts.WorkingDir.empty()) {
ec = FS->getBufferForFile(Filename, Result, FileSize);
ec = FS->getBufferForFile(Filename, Result, FileSize,
/*RequiresNullTerminator=*/true, isVolatile);
if (ec && ErrorStr)
*ErrorStr = ec.message();
return Result.release();
@ -409,7 +411,8 @@ getBufferForFile(const FileEntry *Entry, std::string *ErrorStr,
SmallString<128> FilePath(Entry->getName());
FixupRelativePath(FilePath);
ec = FS->getBufferForFile(FilePath.str(), Result, FileSize);
ec = FS->getBufferForFile(FilePath.str(), Result, FileSize,
/*RequiresNullTerminator=*/true, isVolatile);
if (ec && ErrorStr)
*ErrorStr = ec.message();
return Result.release();

14
clang/lib/Basic/VirtualFileSystem.cpp
View File

@ -67,12 +67,14 @@ FileSystem::~FileSystem() {}
error_code FileSystem::getBufferForFile(const llvm::Twine &Name,
std::unique_ptr<MemoryBuffer> &Result,
int64_t FileSize,
bool RequiresNullTerminator) {
bool RequiresNullTerminator,
bool IsVolatile) {
std::unique_ptr<File> F;
if (error_code EC = openFileForRead(Name, F))
return EC;
error_code EC = F->getBuffer(Name, Result, FileSize, RequiresNullTerminator);
error_code EC = F->getBuffer(Name, Result, FileSize, RequiresNullTerminator,
IsVolatile);
return EC;
}
@ -95,7 +97,8 @@ public:
ErrorOr<Status> status() override;
error_code getBuffer(const Twine &Name, std::unique_ptr<MemoryBuffer> &Result,
int64_t FileSize = -1,
bool RequiresNullTerminator = true) override;
bool RequiresNullTerminator = true,
bool IsVolatile = false) override;
error_code close() override;
void setName(StringRef Name) override;
};
@ -117,10 +120,11 @@ ErrorOr<Status> RealFile::status() {
error_code RealFile::getBuffer(const Twine &Name,
std::unique_ptr<MemoryBuffer> &Result,
int64_t FileSize, bool RequiresNullTerminator) {
int64_t FileSize, bool RequiresNullTerminator,
bool IsVolatile) {
assert(FD != -1 && "cannot get buffer for closed file");
return MemoryBuffer::getOpenFile(FD, Name.str().c_str(), Result, FileSize,
RequiresNullTerminator);
RequiresNullTerminator, IsVolatile);
}
// FIXME: This is terrible, we need this for ::close.