Ignore:
Timestamp:
Jan 25, 2018, 9:21:09 AM (8 years ago)
Author:
[email protected]
Message:

Unreviewed, rolling out r227592.
​https://bugs.webkit.org/show_bug.cgi?id=182110

it made ARM64 (Linux and iOS) crash (Requested by pizlo-mbp on
#webkit).

Reverted changeset:

"JSC GC should support TLCs (thread local caches)"
​https://bugs.webkit.org/show_bug.cgi?id=181559
​https://trac.webkit.org/changeset/227592

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/bytecode/ObjectAllocationProfileInlines.h

    r227592 r227609  
    5454        if (Structure* structure = executable->cachedPolyProtoStructure()) {
    5555            RELEASE_ASSERT(structure->typeInfo().type() == FinalObjectType);
    56             m_allocator = Allocator();
     56            m_allocator = nullptr;
    5757            m_structure.set(vm, owner, structure);
    5858            m_inlineCapacity = structure->inlineCapacity();
    … …  
    100100
    101101    size_t allocationSize = JSFinalObject::allocationSize(inlineCapacity);
    102     Allocator allocator = vm.cellSpace.allocatorForNonVirtual(allocationSize, AllocatorForMode::EnsureAllocator);
     102    BlockDirectory* allocator = vm.cellSpace.allocatorForNonVirtual(allocationSize, AllocatorForMode::EnsureAllocator);
    103103
    104104    // Take advantage of extra inline capacity available in the size class.
    105105    if (allocator) {
    106         size_t slop = (allocator.cellSize(vm.heap) - allocationSize) / sizeof(WriteBarrier<Unknown>);
     106        size_t slop = (allocator->cellSize() - allocationSize) / sizeof(WriteBarrier<Unknown>);
    107107        inlineCapacity += slop;
    108108        if (inlineCapacity > JSFinalObject::maxInlineCapacity())
    … …  
    114114    if (isPolyProto) {
    115115        ASSERT(structure->hasPolyProto());
    116         m_allocator = Allocator();
     116        m_allocator = nullptr;
    117117        executable->setCachedPolyProtoStructure(vm, structure);
    118118    } else {
Note: See TracChangeset for help on using the changeset viewer.