[Win32] mapped_file_region: Fix a bug in CreateFileMapping() that Size must contain...

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

diff --git a/lib/Support/Windows/Path.inc b/lib/Support/Windows/Path.inc
index 95caaa58d7a1e8389c051c61e8f4923505fe4cd2..645d5238dbc77558659d923a64b95dbe0699bd28 100644 (file)
--- a/lib/Support/Windows/Path.inc
+++ b/lib/Support/Windows/Path.inc
@@ -726,8 +726,8 @@ error_code mapped_file_region::init(int FD, bool CloseFD, uint64_t Offset) {
   FileMappingHandle = ::CreateFileMapping(FileHandle,
                                           0,
                                           flprotect,
-                                          Size >> 32,
-                                          Size & 0xffffffff,
+                                          (Offset + Size) >> 32,
+                                          (Offset + Size) & 0xffffffff,
                                           0);
   if (FileMappingHandle == NULL) {
     error_code ec = windows_error(GetLastError());

diff --git a/unittests/Support/MemoryBufferTest.cpp b/unittests/Support/MemoryBufferTest.cpp
index 252d2b555fa5c875b0af5ec959b869a343c53eb7..d9102e07e85391f84e91056db00797307d409e6a 100644 (file)
--- a/unittests/Support/MemoryBufferTest.cpp
+++ b/unittests/Support/MemoryBufferTest.cpp
@@ -138,9 +138,6 @@ void MemoryBufferTest::testGetOpenFileSlice(bool Reopen) {
   EXPECT_EQ(BufData[9], '9');
 }
 
-#if !defined(_WIN32)
-// FIXME: Investigating since r188998.
-
 TEST_F(MemoryBufferTest, getOpenFileNoReopen) {
   testGetOpenFileSlice(false);
 }
@@ -149,6 +146,4 @@ TEST_F(MemoryBufferTest, getOpenFileReopened) {
   testGetOpenFileSlice(true);
 }
 
-#endif // _WIN32
-
 }