Make reallocation of large objects reliable.

third_party/WebKit/Source/platform/heap/HeapPage.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 325 matching lines @@
     RELEASE_ASSERT(getThreadState()->isSweepingInProgress());
     ASSERT(getThreadState()->sweepForbidden());
     ASSERT(!getThreadState()->isMainThread() || ScriptForbiddenScope::isScriptForbidden());
 
     while (m_firstUnsweptPage) {
         sweepUnsweptPage();
     }
     ThreadHeap::reportMemoryUsageForTracing();
 }
 
+Address BaseArena::allocateLargeObject(size_t allocationSize, size_t gcInfoIndex)
+{
+    // TODO(sof): should need arise, support eagerly finalized large objects.
+    CHECK(arenaIndex() != BlinkGC::EagerSweepArenaIndex);
+    LargeObjectArena* largeObjectArena = static_cast<LargeObjectArena*>(getThreadState()->arena(BlinkGC::LargeObjectArenaIndex));
+    Address largeObject = largeObjectArena -> allocateLargeObjectPage(allocationSize, gcInfoIndex);
+    ASAN_MARK_LARGE_VECTOR_CONTAINER(this, largeObject);
+    return largeObject;
+}
+
 NormalPageArena::NormalPageArena(ThreadState* state, int index)
     : BaseArena(state, index)
     , m_currentAllocationPoint(nullptr)
     , m_remainingAllocationSize(0)
     , m_lastRemainingAllocationSize(0)
     , m_promptlyFreedSize(0)
 {
     clearFreeLists();
 }
 
@@ skipping 319 matching lines @@
     m_currentAllocationPoint = point;
     m_lastRemainingAllocationSize = m_remainingAllocationSize = size;
 }
 
 Address NormalPageArena::outOfLineAllocate(size_t allocationSize, size_t gcInfoIndex)
 {
     ASSERT(allocationSize > remainingAllocationSize());
     ASSERT(allocationSize >= allocationGranularity);
 
     // 1. If this allocation is big enough, allocate a large object.
-    if (allocationSize >= largeObjectSizeThreshold) {
-        // TODO(sof): support eagerly finalized large objects, if ever needed.
-        RELEASE_ASSERT(arenaIndex() != BlinkGC::EagerSweepArenaIndex);
-        LargeObjectArena* largeObjectArena = static_cast<LargeObjectArena*>(getThreadState()->arena(BlinkGC::LargeObjectArenaIndex));
-        Address largeObject = largeObjectArena->allocateLargeObjectPage(allocationSize, gcInfoIndex);
-        ASAN_MARK_LARGE_VECTOR_CONTAINER(this, largeObject);
-        return largeObject;
-    }
+    if (allocationSize >= largeObjectSizeThreshold)
+        return allocateLargeObject(allocationSize, gcInfoIndex);
 
     // 2. Try to allocate from a free list.
     updateRemainingAllocationSize();
     Address result = allocateFromFreeList(allocationSize, gcInfoIndex);
     if (result)
         return result;
 
     // 3. Reset the allocation point.
     setAllocationPoint(nullptr, 0);
 
@@ skipping 859 matching lines @@
 
     m_hasEntries = true;
     size_t index = hash(address);
     ASSERT(!(index & 1));
     Address cachePage = roundToBlinkPageStart(address);
     m_entries[index + 1] = m_entries[index];
     m_entries[index] = cachePage;
 }
 
 } // namespace blink