[llvm] r224309 - Remove unused member and simplify. NFC.

[Rafael Espindola]

Author: rafael
Date: Mon Dec 15 20:19:26 2014
New Revision: 224309

URL: http://llvm.org/viewvc/llvm-project?rev=224309&view=rev
Log:
Remove unused member and simplify. NFC.

Modified:
    llvm/trunk/include/llvm/Support/FileSystem.h
    llvm/trunk/lib/Support/Windows/Path.inc

Modified: llvm/trunk/include/llvm/Support/FileSystem.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/FileSystem.h?rev=224309&r1=224308&r2=224309&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Support/FileSystem.h (original)
+++ llvm/trunk/include/llvm/Support/FileSystem.h Mon Dec 15 20:19:26 2014
@@ -640,7 +640,6 @@ private:
   uint64_t Size;
   void *Mapping;
 #ifdef LLVM_ON_WIN32
-  int FileDescriptor;
   void *FileHandle;
   void *FileMappingHandle;
 #endif

Modified: llvm/trunk/lib/Support/Windows/Path.inc
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Windows/Path.inc?rev=224309&r1=224308&r2=224309&view=diff
==============================================================================
--- llvm/trunk/lib/Support/Windows/Path.inc (original)
+++ llvm/trunk/lib/Support/Windows/Path.inc Mon Dec 15 20:19:26 2014
@@ -460,14 +460,9 @@ std::error_code setLastModificationAndAc
 
 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
                            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
   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
       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
   // 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;
   }
 }