src/os/windows/vm/os_windows.cpp

*** 3412,3421 ****
--- 3412,3451 ----
  
  bool os::remove_stack_guard_pages(char* addr, size_t size) {
    return os::uncommit_memory(addr, size);
  }
  
+ static bool protect_pages_individually(char* addr, size_t bytes, unsigned int p, DWORD *old_status) {
+   uint count = 0;
+   bool ret = false;
+   size_t bytes_remaining = bytes;
+   char * next_protect_addr = addr;
+ 
+   // Use VirtualQuery() to get the chunk size.
+   while (bytes_remaining) {
+     MEMORY_BASIC_INFORMATION alloc_info;
+     ret = VirtualQuery(next_protect_addr, &alloc_info, sizeof(alloc_info)) != 0;
+     if (!ret) {
+       return false;
+     }
+ 
+     size_t bytes_to_protect = MIN2(bytes_remaining, (size_t)alloc_info.RegionSize);
+     // We used different API at allocate_pages_individually() based on UseNUMAInterleaving,
+     // but we don't distinguish here as both cases are protected by same API.
+     ret = VirtualProtect(next_protect_addr, bytes_to_protect, p, old_status) != 0;
+     assert(ret, "Failed protecting chunk #%u", count);
+     if (!ret) {
+       return false;
+     }
+ 
+     bytes_remaining -= bytes_to_protect;
+     next_protect_addr += bytes_to_protect;
+     count++;
+   }
+   return ret;
+ }
+ 
  // Set protections specified
  bool os::protect_memory(char* addr, size_t bytes, ProtType prot,
                          bool is_committed) {
    unsigned int p = 0;
    switch (prot) {
*** 3439,3449 ****
    // have different (one-shot) semantics, from MSDN on PAGE_GUARD:
    //
    // Pages in the region become guard pages. Any attempt to access a guard page
    // causes the system to raise a STATUS_GUARD_PAGE exception and turn off
    // the guard page status. Guard pages thus act as a one-time access alarm.
!   return VirtualProtect(addr, bytes, p, &old_status) != 0;
  }
  
  bool os::guard_memory(char* addr, size_t bytes) {
    DWORD old_status;
    return VirtualProtect(addr, bytes, PAGE_READWRITE | PAGE_GUARD, &old_status) != 0;
--- 3469,3490 ----
    // have different (one-shot) semantics, from MSDN on PAGE_GUARD:
    //
    // Pages in the region become guard pages. Any attempt to access a guard page
    // causes the system to raise a STATUS_GUARD_PAGE exception and turn off
    // the guard page status. Guard pages thus act as a one-time access alarm.
!   bool ret = protect_pages_individually(addr, bytes, p, &old_status);
! #ifdef ASSERT
!   if (!ret) {
!     int err = os::get_last_error();
!     char buf[256];
!     size_t buf_len = os::lasterror(buf, sizeof(buf));
!     warning("INFO: os::protect_memory(" PTR_FORMAT ", " SIZE_FORMAT
!           ") failed; error='%s' (DOS error/errno=%d)", addr, bytes,
!           buf_len != 0 ? buf : "<no_error_string>", err);
!   }
! #endif
!   return ret;
  }
  
  bool os::guard_memory(char* addr, size_t bytes) {
    DWORD old_status;
    return VirtualProtect(addr, bytes, PAGE_READWRITE | PAGE_GUARD, &old_status) != 0;