[heap] Fix MemoryAllocator::AllocateAlignedMemory.

src/heap/spaces.cc

 // Copyright 2011 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/heap/spaces.h"
 
 #include <utility>
 
 #include "src/base/bits.h"
 #include "src/base/platform/platform.h"
@@ skipping 441 matching lines @@
   controller->TakeControl(&reservation);
   return base;
 }
 
 Address MemoryAllocator::AllocateAlignedMemory(
     size_t reserve_size, size_t commit_size, size_t alignment,
     Executability executable, base::VirtualMemory* controller) {
   DCHECK(commit_size <= reserve_size);
   base::VirtualMemory reservation;
   Address base = ReserveAlignedMemory(reserve_size, alignment, &reservation);
-  if (base == NULL) return NULL;
+  if (base == NULL) {
+    size_.Decrement(reserve_size);

[Michael Lippautz, 2016/10/13 08:24:36]

IIUC ReserveAlignedMemory only increments if it succeeds, so this Decrement
should not be necessary.

[Ilija.Pavlovic1, 2016/10/13 12:29:58]

This Decrement will be removed.

Done.

+    return NULL;
+  }
 
   if (executable == EXECUTABLE) {
     if (!CommitExecutableMemory(&reservation, base, commit_size,
                                 reserve_size)) {
       base = NULL;
     }
   } else {
     if (reservation.Commit(base, commit_size, false)) {
       UpdateAllocatedSpaceLimits(base, base + commit_size);
     } else {
       base = NULL;
     }
   }
 
   if (base == NULL) {
     // Failed to commit the body. Release the mapping and any partially
     // commited regions inside it.
     reservation.Release();
+    size_.Decrement(reserve_size);
     return NULL;
   }
 
   controller->TakeControl(&reservation);
   return base;
 }
 
 void Page::InitializeAsAnchor(Space* space) {
   set_owner(space);
   set_next_chunk(this);
@@ skipping 2739 matching lines @@
     object->ShortPrint();
     PrintF("\n");
   }
   printf(" --------------------------------------\n");
   printf(" Marked: %x, LiveCount: %x\n", mark_size, LiveBytes());
 }
 
 #endif  // DEBUG
 }  // namespace internal
 }  // namespace v8