caio/clang-p2996
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert commit r271708

Browse Source 
llvm-svn: 271761
This commit is contained in:
Taewook Oh
2016-06-04 03:14:43 +00:00
parent 0c30f89cca
commit 1c1101bb33
14 changed files with 13 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -140,19 +140,16 @@ namespace {
class RealFile : public File {
int FD;
Status S;
std::string RealName;
friend class RealFileSystem;
RealFile(int FD, StringRef NewName, StringRef NewRealPathName)
RealFile(int FD, StringRef NewName)
: FD(FD), S(NewName, {}, {}, {}, {}, {},
llvm::sys::fs::file_type::status_error, {}),
RealName(NewRealPathName.str()) {
llvm::sys::fs::file_type::status_error, {}) {
assert(FD >= 0 && "Invalid or inactive file descriptor");
}
public:
~RealFile() override;
ErrorOr<Status> status() override;
ErrorOr<StringRef> getName() override;
ErrorOr<std::unique_ptr<MemoryBuffer>> getBuffer(const Twine &Name,
int64_t FileSize,
bool RequiresNullTerminator,
@@ -173,10 +170,6 @@ ErrorOr<Status> RealFile::status() {
return S;
}
ErrorOr<StringRef> RealFile::getName() {
return RealName.empty() ? S.getName() : StringRef(RealName);
}
ErrorOr<std::unique_ptr<MemoryBuffer>>
RealFile::getBuffer(const Twine &Name, int64_t FileSize,
bool RequiresNullTerminator, bool IsVolatile) {
@@ -214,10 +207,9 @@ ErrorOr<Status> RealFileSystem::status(const Twine &Path) {
ErrorOr<std::unique_ptr<File>>
RealFileSystem::openFileForRead(const Twine &Name) {
int FD;
SmallString<256> RealName;
if (std::error_code EC = sys::fs::openFileForRead(Name, FD, &RealName))
if (std::error_code EC = sys::fs::openFileForRead(Name, FD))
return EC;
return std::unique_ptr<File>(new RealFile(FD, Name.str(), RealName.str()));
return std::unique_ptr<File>(new RealFile(FD, Name.str()));
}
llvm::ErrorOr<std::string> RealFileSystem::getCurrentWorkingDirectory() const {