Changeset 228576 in webkit for trunk/Source/JavaScriptCore/runtime/ArrayConventions.h

Timestamp:

Feb 16, 2018, 1:38:53 PM (7 years ago)

Author:

[email protected]

Message:

Unreviewed, roll out r228306 (custom memcpy/memset) because the bots say that it was not a
progression.

Source/bmalloc:

• bmalloc/Algorithm.h:

(bmalloc::fastCopy): Deleted.
(bmalloc::fastZeroFill): Deleted.

• bmalloc/Allocator.cpp:

(bmalloc::Allocator::reallocate):

• bmalloc/Bits.h:

(bmalloc::BitsWordOwner::operator=):
(bmalloc::BitsWordOwner::clearAll):
(bmalloc::BitsWordOwner::set):

• bmalloc/IsoPageInlines.h:

(bmalloc::IsoPage<Config>::IsoPage):

• bmalloc/Vector.h:

(bmalloc::Vector<T>::reallocateBuffer):

Source/JavaScriptCore:

• assembler/AssemblerBuffer.h:

(JSC::AssemblerBuffer::append):

• heap/LargeAllocation.cpp:

(JSC::LargeAllocation::tryCreate):

• heap/MarkedBlock.cpp:

(JSC::MarkedBlock::Handle::didAddToDirectory):

• runtime/ArrayBuffer.cpp:

(JSC::ArrayBufferContents::tryAllocate):
(JSC::ArrayBufferContents::copyTo):
(JSC::ArrayBuffer::createInternal):

• runtime/ArrayBufferView.h:

(JSC::ArrayBufferView::zeroRangeImpl):

• runtime/ArrayConventions.cpp:

(JSC::clearArrayMemset):

• runtime/ArrayConventions.h:

(JSC::clearArray):

• runtime/ArrayPrototype.cpp:

(JSC::arrayProtoPrivateFuncConcatMemcpy):

• runtime/ButterflyInlines.h:

(JSC::Butterfly::tryCreate):
(JSC::Butterfly::createOrGrowPropertyStorage):
(JSC::Butterfly::growArrayRight):
(JSC::Butterfly::resizeArray):

• runtime/GenericTypedArrayViewInlines.h:

(JSC::GenericTypedArrayView<Adaptor>::create):

• runtime/JSArray.cpp:

(JSC::JSArray::appendMemcpy):
(JSC::JSArray::fastSlice):

• runtime/JSArrayBufferView.cpp:

(JSC::JSArrayBufferView::ConstructionContext::ConstructionContext):

• runtime/JSGenericTypedArrayViewInlines.h:

(JSC::JSGenericTypedArrayView<Adaptor>::set):

• runtime/JSObject.cpp:

(JSC::JSObject::constructConvertedArrayStorageWithoutCopyingElements):
(JSC::JSObject::shiftButterflyAfterFlattening):

• runtime/PropertyTable.cpp:

(JSC::PropertyTable::PropertyTable):

Source/WTF:

• WTF.xcodeproj/project.pbxproj:
• wtf/BitVector.cpp:

(WTF::BitVector::setSlow):
(WTF::BitVector::clearAll):
(WTF::BitVector::resizeOutOfLine):

• wtf/BitVector.h:

(WTF::BitVector::OutOfLineBits::numWords const):
(WTF::BitVector::wordCount): Deleted.

• wtf/CMakeLists.txt:
• wtf/ConcurrentBuffer.h:

(WTF::ConcurrentBuffer::growExact):

• wtf/FastBitVector.h:

(WTF::FastBitVectorWordOwner::operator=):
(WTF::FastBitVectorWordOwner::clearAll):
(WTF::FastBitVectorWordOwner::set):

• wtf/FastCopy.h: Removed.
• wtf/FastMalloc.cpp:

(WTF::fastZeroedMalloc):
(WTF::fastStrDup):
(WTF::tryFastZeroedMalloc):

• wtf/FastZeroFill.h: Removed.
• wtf/OSAllocator.h:

(WTF::OSAllocator::reallocateCommitted):

• wtf/StringPrintStream.cpp:

(WTF::StringPrintStream::increaseSize):

• wtf/Vector.h:
• wtf/persistence/PersistentDecoder.cpp:

(WTF::Persistence::Decoder::decodeFixedLengthData):

• wtf/persistence/PersistentEncoder.cpp:

(WTF::Persistence::Encoder::encodeFixedLengthData):

• wtf/text/CString.cpp:

(WTF::CString::init):
(WTF::CString::copyBufferIfNeeded):

• wtf/text/LineBreakIteratorPoolICU.h:

(WTF::LineBreakIteratorPool::makeLocaleWithBreakKeyword):

• wtf/text/StringBuilder.cpp:

(WTF::StringBuilder::allocateBuffer):
(WTF::StringBuilder::append):

• wtf/text/StringConcatenate.h:
• wtf/text/StringImpl.h:

(WTF::StringImpl::copyCharacters):

• wtf/text/icu/UTextProvider.cpp:

(WTF::uTextCloneImpl):

• wtf/text/icu/UTextProviderLatin1.cpp:

(WTF::uTextLatin1Clone):
(WTF::openLatin1UTextProvider):

• wtf/threads/Signals.cpp:

File:

• trunk/Source/JavaScriptCore/runtime/ArrayConventions.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/runtime/ArrayConventions.h

@@ -118 +118 @@
 
 #if USE(JSVALUE64)
+JS_EXPORT_PRIVATE void clearArrayMemset(WriteBarrier<Unknown>* base, unsigned count);
 JS_EXPORT_PRIVATE void clearArrayMemset(double* base, unsigned count);
 #endif // USE(JSVALUE64)
@@ -124 +125 @@
 {
 #if USE(JSVALUE64)
-    fastZeroFill(base, count);
-#else
+    const unsigned minCountForMemset = 100;
+    if (count >= minCountForMemset) {
+        clearArrayMemset(base, count);
+        return;
+    }
+#endif
+    
     for (unsigned i = count; i--;)
         base[i].clear();
-#endif
 }