| Index: Source/platform/heap/ThreadState.cpp
|
| diff --git a/Source/platform/heap/ThreadState.cpp b/Source/platform/heap/ThreadState.cpp
|
| index 07be5c643fbe7a15e2ad93f039d691ac1818b8bc..b7487b791a4c72dad3cca2457ffae9c1603865c8 100644
|
| --- a/Source/platform/heap/ThreadState.cpp
|
| +++ b/Source/platform/heap/ThreadState.cpp
|
| @@ -257,9 +257,9 @@ ThreadState::ThreadState()
|
| s_mainThreadUnderestimatedStackSize = StackFrameDepth::getUnderestimatedStackSize() - sizeof(void*);
|
| }
|
|
|
| - for (int heapIndex = 0; heapIndex < LargeObjectHeap; heapIndex++)
|
| - m_heaps[heapIndex] = new ThreadHeapForHeapPage(this, heapIndex);
|
| - m_heaps[LargeObjectHeap] = new ThreadHeapForLargeObject(this, LargeObjectHeap);
|
| + for (int heapIndex = 0; heapIndex < LargeObjectHeapIndex; heapIndex++)
|
| + m_heaps[heapIndex] = new NormalPageHeap(this, heapIndex);
|
| + m_heaps[LargeObjectHeapIndex] = new LargeObjectHeap(this, LargeObjectHeapIndex);
|
|
|
| m_weakCallbackStack = new CallbackStack();
|
| }
|
| @@ -522,7 +522,7 @@ void ThreadState::visitPersistents(Visitor* visitor)
|
| #if ENABLE(GC_PROFILING)
|
| const GCInfo* ThreadState::findGCInfo(Address address)
|
| {
|
| - if (BaseHeapPage* page = findPageFromAddress(address))
|
| + if (BasePage* page = findPageFromAddress(address))
|
| return page->findGCInfo(address);
|
| return nullptr;
|
| }
|
| @@ -954,10 +954,10 @@ void ThreadState::prepareHeapForTermination()
|
| }
|
|
|
| #if ENABLE(ASSERT) || ENABLE(GC_PROFILING)
|
| -BaseHeapPage* ThreadState::findPageFromAddress(Address address)
|
| +BasePage* ThreadState::findPageFromAddress(Address address)
|
| {
|
| for (int i = 0; i < NumberOfHeaps; ++i) {
|
| - if (BaseHeapPage* page = m_heaps[i]->findPageFromAddress(address))
|
| + if (BasePage* page = m_heaps[i]->findPageFromAddress(address))
|
| return page;
|
| }
|
| return nullptr;
|
|
|