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

Remove unused member and simplify. NFC. 

llvm-svn: 224309
This commit is contained in:
Rafael Espindola 2014-12-16 02:19:26 +00:00
parent 1c65001e5e
commit 986f5adf8d
2 changed files with 3 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
llvm/include/llvm/Support/FileSystem.h
View File

@ -640,7 +640,6 @@ private:
uint64_t Size;
void *Mapping;
#ifdef LLVM_ON_WIN32
int FileDescriptor;
void *FileHandle;
void *FileMappingHandle;
#endif

25
llvm/lib/Support/Windows/Path.inc
View File

@ -460,14 +460,9 @@ std::error_code setLastModificationAndAccessTime(int FD, TimeValue Time) {
std::error_code mapped_file_region::init(int FD, uint64_t Offset,
mapmode Mode) {
FileDescriptor = FD;
// Make sure that the requested size fits within SIZE_T.
if (Size > std::numeric_limits<SIZE_T>::max()) {
if (FileDescriptor) {
} else
::CloseHandle(FileHandle);
if (Size > std::numeric_limits<SIZE_T>::max())
return make_error_code(errc::invalid_argument);
}
DWORD flprotect;
switch (Mode) {
@ -483,9 +478,6 @@ std::error_code mapped_file_region::init(int FD, uint64_t Offset,
0);
if (FileMappingHandle == NULL) {
std::error_code ec = windows_error(GetLastError());
if (FileDescriptor) {
} else
::CloseHandle(FileHandle);
return ec;
}
@ -503,9 +495,6 @@ std::error_code mapped_file_region::init(int FD, uint64_t Offset,
if (Mapping == NULL) {
std::error_code ec = windows_error(GetLastError());
::CloseHandle(FileMappingHandle);
if (FileDescriptor) {
} else
::CloseHandle(FileHandle);
return ec;
}
@ -516,9 +505,6 @@ std::error_code mapped_file_region::init(int FD, uint64_t Offset,
std::error_code ec = windows_error(GetLastError());
::UnmapViewOfFile(Mapping);
::CloseHandle(FileMappingHandle);
if (FileDescriptor) {
} else
::CloseHandle(FileHandle);
return ec;
}
Size = mbi.RegionSize;
@ -527,28 +513,23 @@ std::error_code mapped_file_region::init(int FD, uint64_t Offset,
// Close all the handles except for the view. It will keep the other handles
// alive.
::CloseHandle(FileMappingHandle);
if (FileDescriptor) {
} else
::CloseHandle(FileHandle);
return std::error_code();
}
mapped_file_region::mapped_file_region(int fd, mapmode mode, uint64_t length,
uint64_t offset, std::error_code &ec)
: Size(length), Mapping(), FileDescriptor(fd),
: Size(length), Mapping(),
FileHandle(INVALID_HANDLE_VALUE), FileMappingHandle() {
FileHandle = reinterpret_cast<HANDLE>(_get_osfhandle(fd));
if (FileHandle == INVALID_HANDLE_VALUE) {
FileDescriptor = 0;
ec = make_error_code(errc::bad_file_descriptor);
return;
}
ec = init(FileDescriptor, offset, mode);
ec = init(fd, offset, mode);
if (ec) {
Mapping = FileMappingHandle = 0;
FileHandle = INVALID_HANDLE_VALUE;
FileDescriptor = 0;
}
}