Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(72)

Side by Side Diff: runtime/vm/virtual_memory_win.cc

Issue 1406013004: Fixes shutdown crashes. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: address comments Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « runtime/vm/virtual_memory_macos.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
2 // for details. All rights reserved. Use of this source code is governed by a 2 // for details. All rights reserved. Use of this source code is governed by a
3 // BSD-style license that can be found in the LICENSE file. 3 // BSD-style license that can be found in the LICENSE file.
4 4
5 #include "vm/globals.h" 5 #include "vm/globals.h"
6 #if defined(TARGET_OS_WINDOWS) 6 #if defined(TARGET_OS_WINDOWS)
7 7
8 #include "vm/virtual_memory.h" 8 #include "vm/virtual_memory.h"
9 9
10 #include "platform/assert.h" 10 #include "platform/assert.h"
(...skipping 15 matching lines...) Expand all
26 void* address = VirtualAlloc(NULL, size, MEM_RESERVE, PAGE_NOACCESS); 26 void* address = VirtualAlloc(NULL, size, MEM_RESERVE, PAGE_NOACCESS);
27 if (address == NULL) { 27 if (address == NULL) {
28 return NULL; 28 return NULL;
29 } 29 }
30 MemoryRegion region(address, size); 30 MemoryRegion region(address, size);
31 return new VirtualMemory(region); 31 return new VirtualMemory(region);
32 } 32 }
33 33
34 34
35 VirtualMemory::~VirtualMemory() { 35 VirtualMemory::~VirtualMemory() {
36 if (reserved_size_ == 0) { 36 if (embedder_allocated() || (reserved_size_ == 0)) {
37 return; 37 return;
38 } 38 }
39 if (VirtualFree(address(), 0, MEM_RELEASE) == 0) { 39 if (VirtualFree(address(), 0, MEM_RELEASE) == 0) {
40 FATAL("VirtualFree failed"); 40 FATAL("VirtualFree failed");
41 } 41 }
42 } 42 }
43 43
44 44
45 bool VirtualMemory::FreeSubSegment(void* address, intptr_t size) { 45 bool VirtualMemory::FreeSubSegment(void* address, intptr_t size) {
46 // On Windows only the entire segment returned by VirtualAlloc 46 // On Windows only the entire segment returned by VirtualAlloc
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 bool result = VirtualProtect(reinterpret_cast<void*>(page_address), 88 bool result = VirtualProtect(reinterpret_cast<void*>(page_address),
89 end_address - page_address, 89 end_address - page_address,
90 prot, 90 prot,
91 &old_prot); 91 &old_prot);
92 return result; 92 return result;
93 } 93 }
94 94
95 } // namespace dart 95 } // namespace dart
96 96
97 #endif // defined(TARGET_OS_WINDOWS) 97 #endif // defined(TARGET_OS_WINDOWS)
OLDNEW
« no previous file with comments | « runtime/vm/virtual_memory_macos.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698