From: Alexandre Ganea <alexandre.ganea@ubisoft.com>
Date: Thu, 28 Feb 2019 03:42:07 +0000 (+0000)
Subject: Fix SupportTests.exe/AllocationTests/MappedMemoryTest.AllocAndReleaseHuge when the... 
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=79606882d3d8eca8a716b4ec123cecff90889324;p=llvm

Fix SupportTests.exe/AllocationTests/MappedMemoryTest.AllocAndReleaseHuge when the machine doesn't have large pages enabled.

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

diff --git a/lib/Support/Windows/Memory.inc b/lib/Support/Windows/Memory.inc
index 7153bf931e7..0e961fdeaad 100644
--- a/lib/Support/Windows/Memory.inc
+++ b/lib/Support/Windows/Memory.inc
@@ -110,16 +110,16 @@ MemoryBlock Memory::allocateMappedMemory(size_t NumBytes,
     return MemoryBlock();
 
   static size_t DefaultGranularity = getAllocationGranularity();
-  static Optional<size_t> LargePageGranularity = enableProcessLargePages();
+  static size_t LargePageGranularity = enableProcessLargePages();
 
   DWORD AllocType = MEM_RESERVE | MEM_COMMIT;
   bool HugePages = false;
   size_t Granularity = DefaultGranularity;
 
-  if ((Flags & MF_HUGE_HINT) && LargePageGranularity.hasValue()) {
+  if ((Flags & MF_HUGE_HINT) && LargePageGranularity > 0) {
     AllocType |= MEM_LARGE_PAGES;
     HugePages = true;
-    Granularity = *LargePageGranularity;
+    Granularity = LargePageGranularity;
   }
 
   size_t NumBlocks = (NumBytes + Granularity - 1) / Granularity;