Remove the last unnecessary member variable of mapped_file_region. NFC.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@224312 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/Support/FileSystem.h b/include/llvm/Support/FileSystem.h
index 799f88d4175d58d78447d21aed4c572cc59ff8cc..b60c1b07043bf3c2f23aec5c9fba7fc9a2279509 100644 (file)
--- a/include/llvm/Support/FileSystem.h
+++ b/include/llvm/Support/FileSystem.h
@@ -639,9 +639,6 @@ private:
   /// Platform-specific mapping state.
   uint64_t Size;
   void *Mapping;
-#ifdef LLVM_ON_WIN32
-  void *FileHandle;
-#endif
 
   std::error_code init(int FD, uint64_t Offset, mapmode Mode);
 

diff --git a/lib/Support/Windows/Path.inc b/lib/Support/Windows/Path.inc
index a7a4415894792b15d018951360aec4c0c64f5a37..d8b5702bf156a5960183d54815ab5337c751a252 100644 (file)
--- a/lib/Support/Windows/Path.inc
+++ b/lib/Support/Windows/Path.inc
@@ -464,6 +464,10 @@ std::error_code mapped_file_region::init(int FD, uint64_t Offset,
   if (Size > std::numeric_limits<SIZE_T>::max())
     return make_error_code(errc::invalid_argument);
 
+  HANDLE FileHandle = reinterpret_cast<HANDLE>(_get_osfhandle(FD));
+  if (FileHandle == INVALID_HANDLE_VALUE)
+    return make_error_code(errc::bad_file_descriptor);
+
   DWORD flprotect;
   switch (Mode) {
   case readonly:  flprotect = PAGE_READONLY; break;
@@ -518,19 +522,10 @@ 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) {
-  FileHandle = reinterpret_cast<HANDLE>(_get_osfhandle(fd));
-  if (FileHandle == INVALID_HANDLE_VALUE) {
-    ec = make_error_code(errc::bad_file_descriptor);
-    return;
-  }
-
+    : Size(length), Mapping() {
   ec = init(fd, offset, mode);
-  if (ec) {
+  if (ec)
     Mapping = 0;
-    FileHandle = INVALID_HANDLE_VALUE;
-  }
 }
 
 mapped_file_region::~mapped_file_region() {