Changeset 227609 in webkit for trunk/Source/JavaScriptCore/runtime/JSArray.cpp

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:

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

trunk/Source/JavaScriptCore/runtime/JSArray.cpp

@@ -1 +1 @@
 /*
  *  Copyright (C) 1999-2000 Harri Porten ([email protected])
- *  Copyright (C) 2003-2018 Apple Inc. All rights reserved.
+ *  Copyright (C) 2003-2017 Apple Inc. All rights reserved.
  *  Copyright (C) 2003 Peter Kelly ([email protected])
  *  Copyright (C) 2006 Alexey Proskuryakov ([email protected])
@@ -82 +82 @@
 
         unsigned vectorLength = Butterfly::optimalContiguousVectorLength(structure, initialLength);
-        void* temp = vm.jsValueGigacageAuxiliarySpace.allocateNonVirtual(
-            vm,
-            Butterfly::totalSize(0, outOfLineStorage, true, vectorLength * sizeof(EncodedJSValue)),
-            deferralContext, AllocationFailureMode::ReturnNull);
+        void* temp = vm.jsValueGigacageAuxiliarySpace.allocateNonVirtual(Butterfly::totalSize(0, outOfLineStorage, true, vectorLength * sizeof(EncodedJSValue)), deferralContext, AllocationFailureMode::ReturnNull);
         if (UNLIKELY(!temp))
             return nullptr;
@@ -102 +99 @@
         static const unsigned indexBias = 0;
         unsigned vectorLength = ArrayStorage::optimalVectorLength(indexBias, structure, initialLength);
-        void* temp = vm.jsValueGigacageAuxiliarySpace.allocateNonVirtual(
-            vm,
-            Butterfly::totalSize(indexBias, outOfLineStorage, true, ArrayStorage::sizeFor(vectorLength)),
-            deferralContext, AllocationFailureMode::ReturnNull);
+        void* temp = vm.jsValueGigacageAuxiliarySpace.allocateNonVirtual(Butterfly::totalSize(indexBias, outOfLineStorage, true, ArrayStorage::sizeFor(vectorLength)), deferralContext, AllocationFailureMode::ReturnNull);
         if (UNLIKELY(!temp))
             return nullptr;
@@ -375 +369 @@
     } else {
         size_t newSize = Butterfly::totalSize(0, propertyCapacity, true, ArrayStorage::sizeFor(desiredCapacity));
-        newAllocBase = vm.jsValueGigacageAuxiliarySpace.allocateNonVirtual(
-            vm, newSize, nullptr, AllocationFailureMode::ReturnNull);
+        newAllocBase = vm.jsValueGigacageAuxiliarySpace.allocateNonVirtual(newSize, nullptr, AllocationFailureMode::ReturnNull);
         if (!newAllocBase)
             return false;