# HG changeset patch
# User mgerdin
# Date 1472827516 -7200
# Node ID d4d2a4a0e023c56abcefd0ef3393d7aecd3c4157
# Parent  3ef70f1039da071c1dc4af4f02f724806412e0d8
8161079: Default heap size causes native memory exhaustion on 32 bit Windows
Reviewed-by: tschatzl, sjohanss

diff -r 3ef70f1039da -r d4d2a4a0e023 hotspot/src/os/windows/vm/os_windows.cpp
--- a/hotspot/src/os/windows/vm/os_windows.cpp	Wed Sep 07 23:17:24 2016 +0200
+++ b/hotspot/src/os/windows/vm/os_windows.cpp	Fri Sep 02 16:45:16 2016 +0200
@@ -3796,6 +3796,11 @@
   GlobalMemoryStatusEx(&ms);
   _physical_memory = ms.ullTotalPhys;
 
+  if (FLAG_IS_DEFAULT(MaxRAM)) {
+    // Adjust MaxRAM according to the maximum virtual address space available.
+    FLAG_SET_DEFAULT(MaxRAM, MIN2(MaxRAM, (uint64_t) ms.ullTotalVirtual));
+  }
+
   OSVERSIONINFOEX oi;
   oi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
   GetVersionEx((OSVERSIONINFO*)&oi);