[webkit-changes] [WebKit/WebKit] da7026: Fix the MALLOC_HEAP_BREAKDOWN build

Cameron McCormack noreply at github.com
Thu Feb 2 12:01:16 PST 2023


  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: da702614aa846139682587a8f9f2a14ccd59ab8e
      https://github.com/WebKit/WebKit/commit/da702614aa846139682587a8f9f2a14ccd59ab8e
  Author: Cameron McCormack <heycam at apple.com>
  Date:   2023-02-02 (Thu, 02 Feb 2023)

  Changed paths:
    M Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
    M Source/JavaScriptCore/Sources.txt
    M Source/JavaScriptCore/heap/IsoAlignedMemoryAllocator.cpp
    M Source/JavaScriptCore/heap/IsoMemoryAllocatorBase.cpp
    M Source/JavaScriptCore/heap/IsoMemoryAllocatorBase.h
    A Source/JavaScriptCore/jit/ExecutableMemoryHandle.cpp
    M Source/JavaScriptCore/jit/ExecutableMemoryHandle.h
    M Source/bmalloc/bmalloc/IsoHeapInlines.h
    M Source/bmalloc/bmalloc/IsoMallocFallback.cpp

  Log Message:
  -----------
  Fix the MALLOC_HEAP_BREAKDOWN build
https://bugs.webkit.org/show_bug.cgi?id=251561
<rdar://problem/104938871>

Reviewed by Yusuke Suzuki.

This fixes the MALLOC_HEAP_BREAKDOWN build.

JSC's Structure object allocation is not compatible with
IsoMemoryAllocator falling back to regular malloc, so we remove its
support for MALLOC_HEAP_BREAKDOWN for now.

* Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj:
* Source/JavaScriptCore/Sources.txt:
* Source/JavaScriptCore/heap/IsoAlignedMemoryAllocator.cpp:
(JSC::IsoAlignedMemoryAllocator::tryAllocateMemory):
(JSC::IsoAlignedMemoryAllocator::freeMemory):
* Source/JavaScriptCore/heap/IsoMemoryAllocatorBase.cpp:
(JSC::IsoMemoryAllocatorBase::IsoMemoryAllocatorBase):
(JSC::IsoMemoryAllocatorBase::tryAllocateAlignedMemory):
(JSC::IsoMemoryAllocatorBase::freeAlignedMemory):
* Source/JavaScriptCore/heap/IsoMemoryAllocatorBase.h:
* Source/JavaScriptCore/jit/ExecutableMemoryHandle.cpp: Copied from Source/JavaScriptCore/heap/IsoMemoryAllocatorBase.h.
* Source/JavaScriptCore/jit/ExecutableMemoryHandle.h:
* Source/bmalloc/bmalloc/BPlatform.h:
* Source/bmalloc/bmalloc/IsoHeapInlines.h:
* Source/bmalloc/bmalloc/IsoMallocFallback.cpp:
(bmalloc::IsoMallocFallback::tryMalloc):
(bmalloc::IsoMallocFallback::tryFree):

Canonical link: https://commits.webkit.org/259771@main




More information about the webkit-changes mailing list