Changeset 222382 in webkit for trunk/Source/JavaScriptCore/runtime/JSArray.h

Timestamp:

Sep 22, 2017, 3:25:58 AM (8 years ago)

Author:

Yusuke Suzuki

Message:

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

Octane/box2d shows 8% regression (Requested by yusukesuzuki on
#webkit).

Reverted changeset:

"[DFG][FTL] Profile array vector length for array allocation"
​https://bugs.webkit.org/show_bug.cgi?id=177051
​http://trac.webkit.org/changeset/222380

Patch by Commit Queue <​[email protected]> on 2017-09-22

File:

• trunk/Source/JavaScriptCore/runtime/JSArray.h (modified) (4 diffs)

trunk/Source/JavaScriptCore/runtime/JSArray.h

@@ -55 +55 @@
 public:
     static JSArray* tryCreate(VM&, Structure*, unsigned initialLength = 0);
-    static JSArray* tryCreate(VM&, Structure*, unsigned initialLength, unsigned vectorLengthHint);
     static JSArray* create(VM&, Structure*, unsigned initialLength = 0);
     static JSArray* createWithButterfly(VM&, GCDeferralContext*, Structure*, Butterfly*);
@@ -217 +216 @@
     VM&, JSCell* intendedOwner, unsigned initialLength);
 
-inline JSArray* JSArray::tryCreate(VM& vm, Structure* structure, unsigned initialLength, unsigned vectorLengthHint)
-{
-    ASSERT(vectorLengthHint >= initialLength);
+inline JSArray* JSArray::tryCreate(VM& vm, Structure* structure, unsigned initialLength)
+{
     unsigned outOfLineStorage = structure->outOfLineCapacity();
 
@@ -231 +229 @@
             || hasContiguous(indexingType));
 
-        if (UNLIKELY(vectorLengthHint > MAX_STORAGE_VECTOR_LENGTH))
+        if (UNLIKELY(initialLength > MAX_STORAGE_VECTOR_LENGTH))
             return nullptr;
 
-        unsigned vectorLength = Butterfly::optimalContiguousVectorLength(structure, vectorLengthHint);
+        unsigned vectorLength = Butterfly::optimalContiguousVectorLength(structure, initialLength);
         void* temp = vm.jsValueGigacageAuxiliarySpace.tryAllocate(nullptr, Butterfly::totalSize(0, outOfLineStorage, true, vectorLength * sizeof(EncodedJSValue)));
         if (!temp)
@@ -259 +257 @@
 }
 
-inline JSArray* JSArray::tryCreate(VM& vm, Structure* structure, unsigned initialLength)
-{
-    return tryCreate(vm, structure, initialLength, initialLength);
-}
-
 inline JSArray* JSArray::create(VM& vm, Structure* structure, unsigned initialLength)
 {