Changeset 260054 in webkit


Ignore:
Timestamp:
Apr 13, 2020 6:40:46 PM (4 years ago)
Author:
ddkilzer@apple.com
Message:

Replace use of Checked<size_t, RecordOverflow> with CheckedSize
<​https://webkit.org/b/210461>

Reviewed by Mark Lam.

Source/JavaScriptCore:

  • heap/Heap.cpp:

(JSC::Heap::deprecatedReportExtraMemorySlowCase):
(JSC::Heap::extraMemorySize):
(JSC::Heap::updateAllocationLimits):
(JSC::Heap::reportExtraMemoryVisited):

  • heap/SlotVisitor.h:
  • runtime/ArgList.cpp:

(JSC::MarkedArgumentBuffer::expandCapacity):

Source/WebCore:

  • platform/audio/ios/AudioFileReaderIOS.cpp:

(WebCore::createAudioBufferList):

  • platform/graphics/ImageBufferBackend.cpp:

(WebCore::ImageBufferBackend::calculateBackendSize):

  • platform/graphics/win/Direct2DUtilities.cpp:

(WebCore::Direct2D::createDirect2DImageSurfaceWithData):

  • platform/graphics/win/ImageBufferDirect2DBackend.cpp:

(WebCore::ImageBufferDirect2DBackend::copyNativeImage const):

Source/WebKit:

  • Platform/IPC/cocoa/MachMessage.cpp:

(IPC::MachMessage::messageSize):

  • Platform/IPC/cocoa/MachMessage.h:
  • WebProcess/Network/WebSocketChannel.cpp:

(WebKit::WebSocketChannel::increaseBufferedAmount):

Source/WTF:

  • wtf/FastMalloc.cpp:

(WTF::tryFastCalloc):

  • wtf/Gigacage.cpp:

(Gigacage::tryMallocArray):

  • wtf/glib/SocketConnection.cpp:

(WTF::SocketConnection::sendMessage):

Location:
trunk/Source
Files:
17 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/ChangeLog

    r260033 r260054  
     12020-04-13  David Kilzer  <ddkilzer@apple.com>
     2
     3        Replace use of Checked<size_t, RecordOverflow> with CheckedSize
     4        <https://webkit.org/b/210461>
     5
     6        Reviewed by Mark Lam.
     7
     8        * heap/Heap.cpp:
     9        (JSC::Heap::deprecatedReportExtraMemorySlowCase):
     10        (JSC::Heap::extraMemorySize):
     11        (JSC::Heap::updateAllocationLimits):
     12        (JSC::Heap::reportExtraMemoryVisited):
     13        * heap/SlotVisitor.h:
     14        * runtime/ArgList.cpp:
     15        (JSC::MarkedArgumentBuffer::expandCapacity):
     16
    1172020-04-10  Michael Saboff  <msaboff@apple.com>
    218

  • trunk/Source/JavaScriptCore/heap/Heap.cpp

    r259683 r260054  
    526526    // FIXME: Change this to use SaturatedArithmetic when available.
    527527    // https://bugs.webkit.org/show_bug.cgi?id=170411
    528     Checked<size_t, RecordOverflow> checkedNewSize = m_deprecatedExtraMemorySize;
     528    CheckedSize checkedNewSize = m_deprecatedExtraMemorySize;
    529529    checkedNewSize += size;
    530530    m_deprecatedExtraMemorySize = UNLIKELY(checkedNewSize.hasOverflowed()) ? std::numeric_limits<size_t>::max() : checkedNewSize.unsafeGet();
    … …  
    837837    // FIXME: Change this to use SaturatedArithmetic when available.
    838838    // https://bugs.webkit.org/show_bug.cgi?id=170411
    839     Checked<size_t, RecordOverflow> checkedTotal = m_extraMemorySize;
     839    CheckedSize checkedTotal = m_extraMemorySize;
    840840    checkedTotal += m_deprecatedExtraMemorySize;
    841841    checkedTotal += m_arrayBuffers.size();
    … …  
    22812281    currentHeapSize += extraMemorySize();
    22822282    if (ASSERT_ENABLED) {
    2283         Checked<size_t, RecordOverflow> checkedCurrentHeapSize = m_totalBytesVisited;
     2283        CheckedSize checkedCurrentHeapSize = m_totalBytesVisited;
    22842284        checkedCurrentHeapSize += extraMemorySize();
    22852285        ASSERT(!checkedCurrentHeapSize.hasOverflowed() && checkedCurrentHeapSize.unsafeGet() == currentHeapSize);
    … …  
    25862586        // FIXME: Change this to use SaturatedArithmetic when available.
    25872587        // https://bugs.webkit.org/show_bug.cgi?id=170411
    2588         Checked<size_t, RecordOverflow> checkedNewSize = oldSize;
     2588        CheckedSize checkedNewSize = oldSize;
    25892589        checkedNewSize += size;
    25902590        size_t newSize = UNLIKELY(checkedNewSize.hasOverflowed()) ? std::numeric_limits<size_t>::max() : checkedNewSize.unsafeGet();

  • trunk/Source/JavaScriptCore/heap/SlotVisitor.h

    r258386 r260054  
    239239    size_t m_visitCount;
    240240    size_t m_nonCellVisitCount { 0 }; // Used for incremental draining, ignored otherwise.
    241     Checked<size_t, RecordOverflow> m_extraMemorySize { 0 };
     241    CheckedSize m_extraMemorySize { 0 };
    242242    bool m_isInParallelMode;
    243243    bool m_ignoreNewOpaqueRoots { false }; // Useful as a debugging mode.

  • trunk/Source/JavaScriptCore/runtime/ArgList.cpp

    r229366 r260054  
    8686    setNeedsOverflowCheck();
    8787    ASSERT(m_capacity < newCapacity);
    88     auto checkedSize = Checked<size_t, RecordOverflow>(newCapacity) * sizeof(EncodedJSValue);
     88    auto checkedSize = CheckedSize(newCapacity) * sizeof(EncodedJSValue);
    8989    if (UNLIKELY(checkedSize.hasOverflowed()))
    9090        return this->overflowed();

  • trunk/Source/WTF/ChangeLog

    r260052 r260054  
     12020-04-13  David Kilzer  <ddkilzer@apple.com>
     2
     3        Replace use of Checked<size_t, RecordOverflow> with CheckedSize
     4        <https://webkit.org/b/210461>
     5
     6        Reviewed by Mark Lam.
     7
     8        * wtf/FastMalloc.cpp:
     9        (WTF::tryFastCalloc):
     10        * wtf/Gigacage.cpp:
     11        (Gigacage::tryMallocArray):
     12        * wtf/glib/SocketConnection.cpp:
     13        (WTF::SocketConnection::sendMessage):
     14
    1152020-04-13  Simon Fraser  <simon.fraser@apple.com>
    216

  • trunk/Source/WTF/wtf/FastMalloc.cpp

    r259652 r260054  
    571571{
    572572    FAIL_IF_EXCEEDS_LIMIT(numElements * elementSize);
    573     Checked<size_t, RecordOverflow> checkedSize = elementSize;
     573    CheckedSize checkedSize = elementSize;
    574574    checkedSize *= numElements;
    575575    if (checkedSize.hasOverflowed())

  • trunk/Source/WTF/wtf/Gigacage.cpp

    r254087 r260054  
    136136void* tryMallocArray(Kind kind, size_t numElements, size_t elementSize)
    137137{
    138     Checked<size_t, RecordOverflow> checkedSize = elementSize;
     138    CheckedSize checkedSize = elementSize;
    139139    checkedSize *= numElements;
    140140    if (checkedSize.hasOverflowed())

  • trunk/Source/WTF/wtf/glib/SocketConnection.cpp

    r252855 r260054  
    180180    GRefPtr<GVariant> adoptedParameters = parameters;
    181181    size_t parametersSize = parameters ? g_variant_get_size(parameters) : 0;
    182     Checked<size_t, RecordOverflow> messageNameLength = strlen(messageName);
     182    CheckedSize messageNameLength = strlen(messageName);
    183183    messageNameLength++;
    184184    if (UNLIKELY(messageNameLength.hasOverflowed())) {

  • trunk/Source/WebCore/ChangeLog

    r260052 r260054  
     12020-04-13  David Kilzer  <ddkilzer@apple.com>
     2
     3        Replace use of Checked<size_t, RecordOverflow> with CheckedSize
     4        <https://webkit.org/b/210461>
     5
     6        Reviewed by Mark Lam.
     7
     8        * platform/audio/ios/AudioFileReaderIOS.cpp:
     9        (WebCore::createAudioBufferList):
     10        * platform/graphics/ImageBufferBackend.cpp:
     11        (WebCore::ImageBufferBackend::calculateBackendSize):
     12        * platform/graphics/win/Direct2DUtilities.cpp:
     13        (WebCore::Direct2D::createDirect2DImageSurfaceWithData):
     14        * platform/graphics/win/ImageBufferDirect2DBackend.cpp:
     15        (WebCore::ImageBufferDirect2DBackend::copyNativeImage const):
     16
    1172020-04-13  Simon Fraser  <simon.fraser@apple.com>
    218

  • trunk/Source/WebCore/platform/audio/ios/AudioFileReaderIOS.cpp

    r237266 r260054  
    5454static WARN_UNUSED_RETURN AudioBufferList* createAudioBufferList(size_t numberOfBuffers)
    5555{
    56     Checked<size_t, RecordOverflow> bufferListSize = sizeof(AudioBufferList) - sizeof(AudioBuffer);
     56    CheckedSize bufferListSize = sizeof(AudioBufferList) - sizeof(AudioBuffer);
    5757    bufferListSize += numberOfBuffers * sizeof(AudioBuffer);
    5858

  • trunk/Source/WebCore/platform/graphics/ImageBufferBackend.cpp

    r256892 r260054  
    5252        return { };
    5353
    54     Checked<size_t, RecordOverflow> numBytes = Checked<unsigned, RecordOverflow>(backendSize.height()) * bytesPerRow;
     54    CheckedSize numBytes = Checked<unsigned, RecordOverflow>(backendSize.height()) * bytesPerRow;
    5555    if (numBytes.hasOverflowed())
    5656        return { };

  • trunk/Source/WebCore/platform/graphics/win/Direct2DUtilities.cpp

    r250492 r260054  
    127127COMPtr<IWICBitmap> createDirect2DImageSurfaceWithData(void* data, const IntSize& size, unsigned stride)
    128128{
    129     Checked<size_t, RecordOverflow> numBytes = Checked<unsigned, RecordOverflow>(size.height()) * stride;
     129    CheckedSize numBytes = Checked<unsigned, RecordOverflow>(size.height()) * stride;
    130130    if (numBytes.hasOverflowed())
    131131        return nullptr;

  • trunk/Source/WebCore/platform/graphics/win/ImageBufferDirect2DBackend.cpp

    r256892 r260054  
    124124        copyBehavior = DontCopyBackingStore;
    125125
    126     Checked<size_t, RecordOverflow> numBytes = Checked<unsigned, RecordOverflow>(m_data.backingStoreSize.height()) * m_data.bytesPerRow;
     126    CheckedSize numBytes = Checked<unsigned, RecordOverflow>(m_data.backingStoreSize.height()) * m_data.bytesPerRow;
    127127    if (numBytes.hasOverflowed())
    128128        return nullptr;

  • trunk/Source/WebKit/ChangeLog

    r260041 r260054  
     12020-04-13  David Kilzer  <ddkilzer@apple.com>
     2
     3        Replace use of Checked<size_t, RecordOverflow> with CheckedSize
     4        <https://webkit.org/b/210461>
     5
     6        Reviewed by Mark Lam.
     7
     8        * Platform/IPC/cocoa/MachMessage.cpp:
     9        (IPC::MachMessage::messageSize):
     10        * Platform/IPC/cocoa/MachMessage.h:
     11        * WebProcess/Network/WebSocketChannel.cpp:
     12        (WebKit::WebSocketChannel::increaseBufferedAmount):
     13
    1142020-04-13  Per Arne Vollan  <pvollan@apple.com>
    215

  • trunk/Source/WebKit/Platform/IPC/cocoa/MachMessage.cpp

    r258369 r260054  
    5252}
    5353
    54 Checked<size_t, RecordOverflow> MachMessage::messageSize(size_t bodySize, size_t portDescriptorCount, size_t memoryDescriptorCount)
     54CheckedSize MachMessage::messageSize(size_t bodySize, size_t portDescriptorCount, size_t memoryDescriptorCount)
    5555{
    56     Checked<size_t, RecordOverflow> messageSize = sizeof(mach_msg_header_t);
     56    CheckedSize messageSize = sizeof(mach_msg_header_t);
    5757    messageSize += bodySize;
    5858

  • trunk/Source/WebKit/Platform/IPC/cocoa/MachMessage.h

    r258369 r260054  
    4141    ~MachMessage();
    4242
    43     static Checked<size_t, RecordOverflow> messageSize(size_t bodySize, size_t portDescriptorCount, size_t memoryDescriptorCount);
     43    static CheckedSize messageSize(size_t bodySize, size_t portDescriptorCount, size_t memoryDescriptorCount);
    4444
    4545    size_t size() const { return m_size; }

  • trunk/Source/WebKit/WebProcess/Network/WebSocketChannel.cpp

    r257606 r260054  
    125125        return true;
    126126
    127     Checked<size_t, RecordOverflow> checkedNewBufferedAmount = m_bufferedAmount;
     127    CheckedSize checkedNewBufferedAmount = m_bufferedAmount;
    128128    checkedNewBufferedAmount += byteLength;
    129129    if (UNLIKELY(checkedNewBufferedAmount.hasOverflowed())) {
Note: See TracChangeset for help on using the changeset viewer.