diff options
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/include/llvm/Support/FileSystem.h | 1 | ||||
| -rw-r--r-- | llvm/lib/Support/Windows/Path.inc | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/llvm/include/llvm/Support/FileSystem.h b/llvm/include/llvm/Support/FileSystem.h index d86780c38a4..799f88d4175 100644 --- a/llvm/include/llvm/Support/FileSystem.h +++ b/llvm/include/llvm/Support/FileSystem.h @@ -641,7 +641,6 @@ private: void *Mapping; #ifdef LLVM_ON_WIN32 void *FileHandle; - void *FileMappingHandle; #endif std::error_code init(int FD, uint64_t Offset, mapmode Mode); diff --git a/llvm/lib/Support/Windows/Path.inc b/llvm/lib/Support/Windows/Path.inc index a9df6c0c701..a7a44158947 100644 --- a/llvm/lib/Support/Windows/Path.inc +++ b/llvm/lib/Support/Windows/Path.inc @@ -471,7 +471,7 @@ std::error_code mapped_file_region::init(int FD, uint64_t Offset, case priv: flprotect = PAGE_WRITECOPY; break; } - FileMappingHandle = + HANDLE FileMappingHandle = ::CreateFileMappingW(FileHandle, 0, flprotect, (Offset + Size) >> 32, (Offset + Size) & 0xffffffff, @@ -519,7 +519,7 @@ std::error_code mapped_file_region::init(int FD, uint64_t Offset, mapped_file_region::mapped_file_region(int fd, mapmode mode, uint64_t length, uint64_t offset, std::error_code &ec) : Size(length), Mapping(), - FileHandle(INVALID_HANDLE_VALUE), FileMappingHandle() { + FileHandle(INVALID_HANDLE_VALUE) { FileHandle = reinterpret_cast<HANDLE>(_get_osfhandle(fd)); if (FileHandle == INVALID_HANDLE_VALUE) { ec = make_error_code(errc::bad_file_descriptor); @@ -528,7 +528,7 @@ mapped_file_region::mapped_file_region(int fd, mapmode mode, uint64_t length, ec = init(fd, offset, mode); if (ec) { - Mapping = FileMappingHandle = 0; + Mapping = 0; FileHandle = INVALID_HANDLE_VALUE; } } |
