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

Unified Diff: runtime/vm/virtual_memory_win.cc

Issue 2420853002: [windows] Revert virtual memory changes (Closed)
Patch Set: Created 4 years, 2 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/virtual_memory_win.cc
diff --git a/runtime/vm/virtual_memory_win.cc b/runtime/vm/virtual_memory_win.cc
index 43a50c9bca591cc57489320f66210cc9feb8ba01..25846136a996007789204103b8fc3aba808b33ed 100644
--- a/runtime/vm/virtual_memory_win.cc
+++ b/runtime/vm/virtual_memory_win.cc
@@ -35,20 +35,20 @@ VirtualMemory* VirtualMemory::ReserveInternal(intptr_t size) {
VirtualMemory::~VirtualMemory() {
- if (embedder_allocated()) {
+ if (embedder_allocated() || (reserved_size_ == 0)) {
return;
}
if (VirtualFree(address(), 0, MEM_RELEASE) == 0) {
- FATAL1("VirtualFree failed: Error code %d\n", GetLastError());
+ FATAL("VirtualFree failed");
}
}
bool VirtualMemory::FreeSubSegment(void* address, intptr_t size) {
- if (VirtualFree(address, size, MEM_DECOMMIT) == 0) {
- FATAL1("VirtualFree failed: Error code %d\n", GetLastError());
- }
- return true;
+ // On Windows only the entire segment returned by VirtualAlloc
+ // can be freed. Therefore we will have to waste these unused
+ // virtual memory sub-segments.
+ return false;
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698