JSArray.cpp 45.6 KB
Newer Older
darin's avatar
darin committed
1 2
/*
 *  Copyright (C) 1999-2000 Harri Porten (porten@kde.org)
3
 *  Copyright (C) 2003, 2007, 2008, 2009 Apple Inc. All rights reserved.
darin's avatar
darin committed
4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23
 *  Copyright (C) 2003 Peter Kelly (pmk@post.com)
 *  Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com)
 *
 *  This library is free software; you can redistribute it and/or
 *  modify it under the terms of the GNU Lesser General Public
 *  License as published by the Free Software Foundation; either
 *  version 2 of the License, or (at your option) any later version.
 *
 *  This library is distributed in the hope that it will be useful,
 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 *  Lesser General Public License for more details.
 *
 *  You should have received a copy of the GNU Lesser General Public
 *  License along with this library; if not, write to the Free Software
 *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 *
 */

#include "config.h"
darin@apple.com's avatar
darin@apple.com committed
24
#include "JSArray.h"
darin's avatar
darin committed
25

darin@apple.com's avatar
darin@apple.com committed
26
#include "ArrayPrototype.h"
27
#include "CachedCall.h"
28
#include "Error.h"
29
#include "Executable.h"
darin's avatar
darin committed
30
#include "PropertyNameArray.h"
ap@webkit.org's avatar
ap@webkit.org committed
31
#include <wtf/AVLTree.h>
32
#include <wtf/Assertions.h>
33
#include <wtf/OwnPtr.h>
34
#include <Operations.h>
darin's avatar
darin committed
35

36
using namespace std;
ap@webkit.org's avatar
ap@webkit.org committed
37
using namespace WTF;
bdash's avatar
bdash committed
38

39
namespace JSC {
darin's avatar
darin committed
40

ggaren@apple.com's avatar
ggaren@apple.com committed
41 42
ASSERT_CLASS_FITS_IN_CELL(JSArray);

barraclough@apple.com's avatar
barraclough@apple.com committed
43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69
// Overview of JSArray
//
// Properties of JSArray objects may be stored in one of three locations:
//   * The regular JSObject property map.
//   * A storage vector.
//   * A sparse map of array entries.
//
// Properties with non-numeric identifiers, with identifiers that are not representable
// as an unsigned integer, or where the value is greater than  MAX_ARRAY_INDEX
// (specifically, this is only one property - the value 0xFFFFFFFFU as an unsigned 32-bit
// integer) are not considered array indices and will be stored in the JSObject property map.
//
// All properties with a numeric identifer, representable as an unsigned integer i,
// where (i <= MAX_ARRAY_INDEX), are an array index and will be stored in either the
// storage vector or the sparse map.  An array index i will be handled in the following
// fashion:
//
//   * Where (i < MIN_SPARSE_ARRAY_INDEX) the value will be stored in the storage vector.
//   * Where (MIN_SPARSE_ARRAY_INDEX <= i <= MAX_STORAGE_VECTOR_INDEX) the value will either
//     be stored in the storage vector or in the sparse array, depending on the density of
//     data that would be stored in the vector (a vector being used where at least
//     (1 / minDensityMultiplier) of the entries would be populated).
//   * Where (MAX_STORAGE_VECTOR_INDEX < i <= MAX_ARRAY_INDEX) the value will always be stored
//     in the sparse array.

// The definition of MAX_STORAGE_VECTOR_LENGTH is dependant on the definition storageSize
// function below - the MAX_STORAGE_VECTOR_LENGTH limit is defined such that the storage
ggaren@apple.com's avatar
ggaren@apple.com committed
70 71 72
// size calculation cannot overflow.  (sizeof(ArrayStorage) - sizeof(JSValue)) +
// (vectorLength * sizeof(JSValue)) must be <= 0xFFFFFFFFU (which is maximum value of size_t).
#define MAX_STORAGE_VECTOR_LENGTH static_cast<unsigned>((0xFFFFFFFFU - (sizeof(ArrayStorage) - sizeof(JSValue))) / sizeof(JSValue))
barraclough@apple.com's avatar
barraclough@apple.com committed
73 74 75 76 77

// These values have to be macros to be used in max() and min() without introducing
// a PIC branch in Mach-O binaries, see <rdar://problem/5971391>.
#define MIN_SPARSE_ARRAY_INDEX 10000U
#define MAX_STORAGE_VECTOR_INDEX (MAX_STORAGE_VECTOR_LENGTH - 1)
78
// 0xFFFFFFFF is a bit weird -- is not an array index even though it's an integer.
barraclough@apple.com's avatar
barraclough@apple.com committed
79
#define MAX_ARRAY_INDEX 0xFFFFFFFEU
darin's avatar
darin committed
80

81 82 83 84 85 86 87 88
// The value BASE_VECTOR_LEN is the maximum number of vector elements we'll allocate
// for an array that was created with a sepcified length (e.g. a = new Array(123))
#define BASE_VECTOR_LEN 4U
    
// The upper bound to the size we'll grow a zero length array when the first element
// is added.
#define FIRST_VECTOR_GROW 4U

darin's avatar
darin committed
89
// Our policy for when to use a vector and when to use a sparse map.
barraclough@apple.com's avatar
barraclough@apple.com committed
90 91
// For all array indices under MIN_SPARSE_ARRAY_INDEX, we always use a vector.
// When indices greater than MIN_SPARSE_ARRAY_INDEX are involved, we use a vector
darin's avatar
darin committed
92 93 94
// as long as it is 1/8 full. If more sparse than that, we use a map.
static const unsigned minDensityMultiplier = 8;

95
const ClassInfo JSArray::s_info = {"Array", &JSNonFinalObject::s_info, 0, 0};
darin's avatar
darin committed
96

97 98 99 100 101
// We keep track of the size of the last array after it was grown.  We use this
// as a simple heuristic for as the value to grow the next array from size 0.
// This value is capped by the constant FIRST_VECTOR_GROW defined above.
static unsigned lastArraySize = 0;

darin's avatar
darin committed
102 103
static inline size_t storageSize(unsigned vectorLength)
{
barraclough@apple.com's avatar
barraclough@apple.com committed
104 105 106 107
    ASSERT(vectorLength <= MAX_STORAGE_VECTOR_LENGTH);

    // MAX_STORAGE_VECTOR_LENGTH is defined such that provided (vectorLength <= MAX_STORAGE_VECTOR_LENGTH)
    // - as asserted above - the following calculation cannot overflow.
ggaren@apple.com's avatar
ggaren@apple.com committed
108
    size_t size = (sizeof(ArrayStorage) - sizeof(JSValue)) + (vectorLength * sizeof(JSValue));
barraclough@apple.com's avatar
barraclough@apple.com committed
109 110
    // Assertion to detect integer overflow in previous calculation (should not be possible, provided that
    // MAX_STORAGE_VECTOR_LENGTH is correctly defined).
ggaren@apple.com's avatar
ggaren@apple.com committed
111
    ASSERT(((size - (sizeof(ArrayStorage) - sizeof(JSValue))) / sizeof(JSValue) == vectorLength) && (size >= (sizeof(ArrayStorage) - sizeof(JSValue))));
barraclough@apple.com's avatar
barraclough@apple.com committed
112 113

    return size;
darin's avatar
darin committed
114 115 116 117 118 119 120
}

static inline bool isDenseEnoughForVector(unsigned length, unsigned numValues)
{
    return length / minDensityMultiplier <= numValues;
}

121 122
#if !CHECK_ARRAY_CONSISTENCY

darin@apple.com's avatar
darin@apple.com committed
123
inline void JSArray::checkConsistency(ConsistencyCheckType)
124 125 126 127 128
{
}

#endif

129
JSArray::JSArray(VPtrStealingHackType)
130
    : JSNonFinalObject(VPtrStealingHack)
131 132 133
{
}

134 135
JSArray::JSArray(JSGlobalData& globalData, Structure* structure)
    : JSNonFinalObject(globalData, structure)
weinig@apple.com's avatar
weinig@apple.com committed
136
{
137 138
    ASSERT(inherits(&s_info));

weinig@apple.com's avatar
weinig@apple.com committed
139 140
    unsigned initialCapacity = 0;

141 142
    m_storage = static_cast<ArrayStorage*>(fastZeroedMalloc(storageSize(initialCapacity)));
    m_storage->m_allocBase = m_storage;
143
    m_indexBias = 0;
144
    m_vectorLength = initialCapacity;
weinig@apple.com's avatar
weinig@apple.com committed
145 146

    checkConsistency();
147 148

    Heap::heap(this)->reportExtraMemoryCost(storageSize(0));
weinig@apple.com's avatar
weinig@apple.com committed
149 150
}

151 152
JSArray::JSArray(JSGlobalData& globalData, Structure* structure, unsigned initialLength, ArrayCreationMode creationMode)
    : JSNonFinalObject(globalData, structure)
darin's avatar
darin committed
153
{
154 155
    ASSERT(inherits(&s_info));

156 157 158 159
    unsigned initialCapacity;
    if (creationMode == CreateCompact)
        initialCapacity = initialLength;
    else
160 161
        initialCapacity = min(BASE_VECTOR_LEN, MIN_SPARSE_ARRAY_INDEX);
    
162 163 164
    m_storage = static_cast<ArrayStorage*>(fastMalloc(storageSize(initialCapacity)));
    m_storage->m_allocBase = m_storage;
    m_storage->m_length = initialLength;
165
    m_indexBias = 0;
166
    m_vectorLength = initialCapacity;
167 168 169
    m_storage->m_sparseValueMap = 0;
    m_storage->subclassData = 0;
    m_storage->reportedMapCapacity = 0;
darin's avatar
darin committed
170

171 172
    if (creationMode == CreateCompact) {
#if CHECK_ARRAY_CONSISTENCY
173
        m_storage->m_inCompactInitialization = !!initialCapacity;
174
#endif
175 176
        m_storage->m_length = 0;
        m_storage->m_numValuesInVector = initialCapacity;
177 178
    } else {
#if CHECK_ARRAY_CONSISTENCY
179
        storage->m_inCompactInitialization = false;
180
#endif
181 182
        m_storage->m_length = initialLength;
        m_storage->m_numValuesInVector = 0;
183
        WriteBarrier<Unknown>* vector = m_storage->m_vector;
184
        for (size_t i = 0; i < initialCapacity; ++i)
185
            vector[i].clear();
186
    }
187

188
    checkConsistency();
189
    
190
    Heap::heap(this)->reportExtraMemoryCost(storageSize(initialCapacity));
darin's avatar
darin committed
191 192
}

193 194
JSArray::JSArray(JSGlobalData& globalData, Structure* structure, const ArgList& list)
    : JSNonFinalObject(globalData, structure)
darin's avatar
darin committed
195
{
196 197
    ASSERT(inherits(&s_info));

198
    unsigned initialCapacity = list.size();
199 200 201 202 203 204 205 206 207 208
    unsigned initialStorage;
    
    // If the ArgList is empty, allocate space for 3 entries.  This value empirically
    // works well for benchmarks.
    if (!initialCapacity)
        initialStorage = 3;
    else
        initialStorage = initialCapacity;
    
    m_storage = static_cast<ArrayStorage*>(fastMalloc(storageSize(initialStorage)));
209
    m_storage->m_allocBase = m_storage;
210
    m_indexBias = 0;
211
    m_storage->m_length = initialCapacity;
212
    m_vectorLength = initialStorage;
213 214 215 216
    m_storage->m_numValuesInVector = initialCapacity;
    m_storage->m_sparseValueMap = 0;
    m_storage->subclassData = 0;
    m_storage->reportedMapCapacity = 0;
217
#if CHECK_ARRAY_CONSISTENCY
218
    m_storage->m_inCompactInitialization = false;
219
#endif
darin's avatar
darin committed
220

ggaren's avatar
ggaren committed
221
    size_t i = 0;
222
    WriteBarrier<Unknown>* vector = m_storage->m_vector;
darin@apple.com's avatar
darin@apple.com committed
223 224
    ArgList::const_iterator end = list.end();
    for (ArgList::const_iterator it = list.begin(); it != end; ++it, ++i)
225
        vector[i].set(globalData, this, *it);
226
    for (; i < initialStorage; i++)
227
        vector[i].clear();
darin's avatar
darin committed
228

229
    checkConsistency();
230

231
    Heap::heap(this)->reportExtraMemoryCost(storageSize(initialStorage));
darin's avatar
darin committed
232 233
}

darin@apple.com's avatar
darin@apple.com committed
234
JSArray::~JSArray()
darin's avatar
darin committed
235
{
ap@apple.com's avatar
ap@apple.com committed
236
    ASSERT(vptr() == JSGlobalData::jsArrayVPtr);
237 238
    checkConsistency(DestructorConsistencyCheck);

239 240
    delete m_storage->m_sparseValueMap;
    fastFree(m_storage->m_allocBase);
darin's avatar
darin committed
241 242
}

243
bool JSArray::getOwnPropertySlot(ExecState* exec, unsigned i, PropertySlot& slot)
darin's avatar
darin committed
244
{
245
    ArrayStorage* storage = m_storage;
246
    
ggaren@apple.com's avatar
ggaren@apple.com committed
247
    if (i >= storage->m_length) {
barraclough@apple.com's avatar
barraclough@apple.com committed
248
        if (i > MAX_ARRAY_INDEX)
ap@webkit.org's avatar
ap@webkit.org committed
249
            return getOwnPropertySlot(exec, Identifier::from(exec, i), slot);
darin's avatar
darin committed
250 251 252
        return false;
    }

253
    if (i < m_vectorLength) {
254 255 256
        JSValue value = storage->m_vector[i].get();
        if (value) {
            slot.setValue(value);
darin's avatar
darin committed
257 258 259
            return true;
        }
    } else if (SparseArrayValueMap* map = storage->m_sparseValueMap) {
barraclough@apple.com's avatar
barraclough@apple.com committed
260
        if (i >= MIN_SPARSE_ARRAY_INDEX) {
darin@apple.com's avatar
darin@apple.com committed
261 262
            SparseArrayValueMap::iterator it = map->find(i);
            if (it != map->end()) {
263
                slot.setValue(it->second.get());
darin@apple.com's avatar
darin@apple.com committed
264 265
                return true;
            }
darin's avatar
darin committed
266 267 268
        }
    }

269
    return JSObject::getOwnPropertySlot(exec, Identifier::from(exec, i), slot);
darin's avatar
darin committed
270 271
}

darin@apple.com's avatar
darin@apple.com committed
272
bool JSArray::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot)
darin's avatar
darin committed
273 274
{
    if (propertyName == exec->propertyNames().length) {
275
        slot.setValue(jsNumber(length()));
darin's avatar
darin committed
276 277 278 279
        return true;
    }

    bool isArrayIndex;
280
    unsigned i = propertyName.toArrayIndex(isArrayIndex);
darin's avatar
darin committed
281
    if (isArrayIndex)
282
        return JSArray::getOwnPropertySlot(exec, i, slot);
darin's avatar
darin committed
283 284 285 286

    return JSObject::getOwnPropertySlot(exec, propertyName, slot);
}

287 288 289
bool JSArray::getOwnPropertyDescriptor(ExecState* exec, const Identifier& propertyName, PropertyDescriptor& descriptor)
{
    if (propertyName == exec->propertyNames().length) {
290
        descriptor.setDescriptor(jsNumber(length()), DontDelete | DontEnum);
291 292
        return true;
    }
293

294
    ArrayStorage* storage = m_storage;
295 296
    
    bool isArrayIndex;
297
    unsigned i = propertyName.toArrayIndex(isArrayIndex);
298
    if (isArrayIndex) {
299
        if (i >= storage->m_length)
300
            return false;
301
        if (i < m_vectorLength) {
302
            WriteBarrier<Unknown>& value = storage->m_vector[i];
303
            if (value) {
304
                descriptor.setDescriptor(value.get(), 0);
305 306
                return true;
            }
307
        } else if (SparseArrayValueMap* map = storage->m_sparseValueMap) {
308 309 310
            if (i >= MIN_SPARSE_ARRAY_INDEX) {
                SparseArrayValueMap::iterator it = map->find(i);
                if (it != map->end()) {
311
                    descriptor.setDescriptor(it->second.get(), 0);
312 313 314 315 316 317 318 319
                    return true;
                }
            }
        }
    }
    return JSObject::getOwnPropertyDescriptor(exec, propertyName, descriptor);
}

darin's avatar
darin committed
320
// ECMA 15.4.5.1
ggaren@apple.com's avatar
ggaren@apple.com committed
321
void JSArray::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot)
darin's avatar
darin committed
322 323
{
    bool isArrayIndex;
324
    unsigned i = propertyName.toArrayIndex(isArrayIndex);
darin's avatar
darin committed
325
    if (isArrayIndex) {
darin@apple.com's avatar
darin@apple.com committed
326
        put(exec, i, value);
darin's avatar
darin committed
327 328 329 330
        return;
    }

    if (propertyName == exec->propertyNames().length) {
weinig@apple.com's avatar
weinig@apple.com committed
331 332
        unsigned newLength = value.toUInt32(exec);
        if (value.toNumber(exec) != static_cast<double>(newLength)) {
333
            throwError(exec, createRangeError(exec, "Invalid array length"));
darin's avatar
darin committed
334 335 336 337 338 339
            return;
        }
        setLength(newLength);
        return;
    }

weinig@apple.com's avatar
weinig@apple.com committed
340
    JSObject::put(exec, propertyName, value, slot);
darin's avatar
darin committed
341 342
}

ggaren@apple.com's avatar
ggaren@apple.com committed
343
void JSArray::put(ExecState* exec, unsigned i, JSValue value)
darin's avatar
darin committed
344
{
345 346
    checkConsistency();

347
    ArrayStorage* storage = m_storage;
348 349

    unsigned length = storage->m_length;
barraclough@apple.com's avatar
barraclough@apple.com committed
350
    if (i >= length && i <= MAX_ARRAY_INDEX) {
darin's avatar
darin committed
351
        length = i + 1;
352
        storage->m_length = length;
darin's avatar
darin committed
353 354
    }

355
    if (i < m_vectorLength) {
356
        WriteBarrier<Unknown>& valueSlot = storage->m_vector[i];
357
        if (valueSlot) {
358
            valueSlot.set(exec->globalData(), this, value);
359 360 361
            checkConsistency();
            return;
        }
362
        valueSlot.set(exec->globalData(), this, value);
363
        ++storage->m_numValuesInVector;
364
        checkConsistency();
darin's avatar
darin committed
365 366 367
        return;
    }

368 369 370
    putSlowCase(exec, i, value);
}

ggaren@apple.com's avatar
ggaren@apple.com committed
371
NEVER_INLINE void JSArray::putSlowCase(ExecState* exec, unsigned i, JSValue value)
372
{
373
    ArrayStorage* storage = m_storage;
374
    
darin's avatar
darin committed
375
    SparseArrayValueMap* map = storage->m_sparseValueMap;
ap@webkit.org's avatar
ap@webkit.org committed
376

barraclough@apple.com's avatar
barraclough@apple.com committed
377 378
    if (i >= MIN_SPARSE_ARRAY_INDEX) {
        if (i > MAX_ARRAY_INDEX) {
weinig@apple.com's avatar
weinig@apple.com committed
379 380
            PutPropertySlot slot;
            put(exec, Identifier::from(exec, i), value, slot);
381 382 383
            return;
        }

ap@webkit.org's avatar
ap@webkit.org committed
384
        // We miss some cases where we could compact the storage, such as a large array that is being filled from the end
385
        // (which will only be compacted as we reach indices that are less than MIN_SPARSE_ARRAY_INDEX) - but this makes the check much faster.
barraclough@apple.com's avatar
barraclough@apple.com committed
386
        if ((i > MAX_STORAGE_VECTOR_INDEX) || !isDenseEnoughForVector(i + 1, storage->m_numValuesInVector + 1)) {
ap@webkit.org's avatar
ap@webkit.org committed
387 388 389 390
            if (!map) {
                map = new SparseArrayValueMap;
                storage->m_sparseValueMap = map;
            }
391

392 393 394 395
            WriteBarrier<Unknown> temp;
            pair<SparseArrayValueMap::iterator, bool> result = map->add(i, temp);
            result.first->second.set(exec->globalData(), this, value);
            if (!result.second) // pre-existing entry
396 397 398 399 400 401 402
                return;

            size_t capacity = map->capacity();
            if (capacity != storage->reportedMapCapacity) {
                Heap::heap(this)->reportExtraMemoryCost((capacity - storage->reportedMapCapacity) * (sizeof(unsigned) + sizeof(JSValue)));
                storage->reportedMapCapacity = capacity;
            }
darin's avatar
darin committed
403 404 405 406
            return;
        }
    }

ap@webkit.org's avatar
ap@webkit.org committed
407 408 409
    // We have decided that we'll put the new item into the vector.
    // Fast case is when there is no sparse map, so we can increase the vector size without moving values from it.
    if (!map || map->isEmpty()) {
barraclough@apple.com's avatar
barraclough@apple.com committed
410
        if (increaseVectorLength(i + 1)) {
411
            storage = m_storage;
412
            storage->m_vector[i].set(exec->globalData(), this, value);
413
            ++storage->m_numValuesInVector;
barraclough@apple.com's avatar
barraclough@apple.com committed
414 415 416
            checkConsistency();
        } else
            throwOutOfMemoryError(exec);
darin's avatar
darin committed
417 418 419
        return;
    }

ap@webkit.org's avatar
ap@webkit.org committed
420 421
    // Decide how many values it would be best to move from the map.
    unsigned newNumValuesInVector = storage->m_numValuesInVector + 1;
422
    unsigned newVectorLength = getNewVectorLength(i + 1);
423
    for (unsigned j = max(m_vectorLength, MIN_SPARSE_ARRAY_INDEX); j < newVectorLength; ++j)
darin's avatar
darin committed
424
        newNumValuesInVector += map->contains(j);
barraclough@apple.com's avatar
barraclough@apple.com committed
425
    if (i >= MIN_SPARSE_ARRAY_INDEX)
ap@webkit.org's avatar
ap@webkit.org committed
426
        newNumValuesInVector -= map->contains(i);
darin's avatar
darin committed
427
    if (isDenseEnoughForVector(newVectorLength, newNumValuesInVector)) {
428
        unsigned needLength = max(i + 1, storage->m_length);
darin's avatar
darin committed
429
        unsigned proposedNewNumValuesInVector = newNumValuesInVector;
barraclough@apple.com's avatar
barraclough@apple.com committed
430
        // If newVectorLength is already the maximum - MAX_STORAGE_VECTOR_LENGTH - then do not attempt to grow any further.
431
        while ((newVectorLength < needLength) && (newVectorLength < MAX_STORAGE_VECTOR_LENGTH)) {
432
            unsigned proposedNewVectorLength = getNewVectorLength(newVectorLength + 1);
barraclough@apple.com's avatar
barraclough@apple.com committed
433
            for (unsigned j = max(newVectorLength, MIN_SPARSE_ARRAY_INDEX); j < proposedNewVectorLength; ++j)
darin's avatar
darin committed
434 435 436 437 438 439 440 441
                proposedNewNumValuesInVector += map->contains(j);
            if (!isDenseEnoughForVector(proposedNewVectorLength, proposedNewNumValuesInVector))
                break;
            newVectorLength = proposedNewVectorLength;
            newNumValuesInVector = proposedNewNumValuesInVector;
        }
    }

442
    void* baseStorage = storage->m_allocBase;
443 444
    
    if (!tryFastRealloc(baseStorage, storageSize(newVectorLength + m_indexBias)).getValue(baseStorage)) {
barraclough@apple.com's avatar
barraclough@apple.com committed
445 446 447
        throwOutOfMemoryError(exec);
        return;
    }
darin's avatar
darin committed
448

449
    m_storage = reinterpret_cast_ptr<ArrayStorage*>(static_cast<char*>(baseStorage) + m_indexBias * sizeof(JSValue));
450 451
    m_storage->m_allocBase = baseStorage;
    storage = m_storage;
452
    
453
    unsigned vectorLength = m_vectorLength;
454
    WriteBarrier<Unknown>* vector = storage->m_vector;
455

darin's avatar
darin committed
456 457
    if (newNumValuesInVector == storage->m_numValuesInVector + 1) {
        for (unsigned j = vectorLength; j < newVectorLength; ++j)
458
            vector[j].clear();
barraclough@apple.com's avatar
barraclough@apple.com committed
459
        if (i > MIN_SPARSE_ARRAY_INDEX)
ap@webkit.org's avatar
ap@webkit.org committed
460
            map->remove(i);
darin's avatar
darin committed
461
    } else {
barraclough@apple.com's avatar
barraclough@apple.com committed
462
        for (unsigned j = vectorLength; j < max(vectorLength, MIN_SPARSE_ARRAY_INDEX); ++j)
463 464
            vector[j].clear();
        JSGlobalData& globalData = exec->globalData();
barraclough@apple.com's avatar
barraclough@apple.com committed
465
        for (unsigned j = max(vectorLength, MIN_SPARSE_ARRAY_INDEX); j < newVectorLength; ++j)
466
            vector[j].set(globalData, this, map->take(j).get());
darin's avatar
darin committed
467 468
    }

469
    ASSERT(i < newVectorLength);
darin's avatar
darin committed
470

471
    m_vectorLength = newVectorLength;
darin's avatar
darin committed
472
    storage->m_numValuesInVector = newNumValuesInVector;
ap@webkit.org's avatar
ap@webkit.org committed
473

474
    storage->m_vector[i].set(exec->globalData(), this, value);
475 476

    checkConsistency();
477 478

    Heap::heap(this)->reportExtraMemoryCost(storageSize(newVectorLength) - storageSize(vectorLength));
darin's avatar
darin committed
479 480
}

darin@apple.com's avatar
darin@apple.com committed
481
bool JSArray::deleteProperty(ExecState* exec, const Identifier& propertyName)
darin's avatar
darin committed
482 483
{
    bool isArrayIndex;
484
    unsigned i = propertyName.toArrayIndex(isArrayIndex);
darin's avatar
darin committed
485 486 487 488 489 490 491 492 493
    if (isArrayIndex)
        return deleteProperty(exec, i);

    if (propertyName == exec->propertyNames().length)
        return false;

    return JSObject::deleteProperty(exec, propertyName);
}

darin@apple.com's avatar
darin@apple.com committed
494
bool JSArray::deleteProperty(ExecState* exec, unsigned i)
darin's avatar
darin committed
495
{
496 497
    checkConsistency();

498
    ArrayStorage* storage = m_storage;
499
    
500
    if (i < m_vectorLength) {
501
        WriteBarrier<Unknown>& valueSlot = storage->m_vector[i];
502 503 504 505
        if (!valueSlot) {
            checkConsistency();
            return false;
        }
506
        valueSlot.clear();
507
        --storage->m_numValuesInVector;
508
        checkConsistency();
509
        return true;
darin's avatar
darin committed
510 511 512
    }

    if (SparseArrayValueMap* map = storage->m_sparseValueMap) {
barraclough@apple.com's avatar
barraclough@apple.com committed
513
        if (i >= MIN_SPARSE_ARRAY_INDEX) {
darin@apple.com's avatar
darin@apple.com committed
514 515 516
            SparseArrayValueMap::iterator it = map->find(i);
            if (it != map->end()) {
                map->remove(it);
517
                checkConsistency();
darin@apple.com's avatar
darin@apple.com committed
518 519
                return true;
            }
darin's avatar
darin committed
520 521 522
        }
    }

523 524
    checkConsistency();

barraclough@apple.com's avatar
barraclough@apple.com committed
525
    if (i > MAX_ARRAY_INDEX)
ap@webkit.org's avatar
ap@webkit.org committed
526
        return deleteProperty(exec, Identifier::from(exec, i));
darin's avatar
darin committed
527 528 529 530

    return false;
}

531
void JSArray::getOwnPropertyNames(ExecState* exec, PropertyNameArray& propertyNames, EnumerationMode mode)
darin's avatar
darin committed
532 533
{
    // FIXME: Filling PropertyNameArray with an identifier for every integer
534 535
    // is incredibly inefficient for large arrays. We need a different approach,
    // which almost certainly means a different structure for PropertyNameArray.
darin's avatar
darin committed
536

537
    ArrayStorage* storage = m_storage;
538
    
539
    unsigned usedVectorLength = min(storage->m_length, m_vectorLength);
darin's avatar
darin committed
540
    for (unsigned i = 0; i < usedVectorLength; ++i) {
541
        if (storage->m_vector[i])
ap@webkit.org's avatar
ap@webkit.org committed
542
            propertyNames.add(Identifier::from(exec, i));
darin's avatar
darin committed
543 544 545 546 547
    }

    if (SparseArrayValueMap* map = storage->m_sparseValueMap) {
        SparseArrayValueMap::iterator end = map->end();
        for (SparseArrayValueMap::iterator it = map->begin(); it != end; ++it)
ap@webkit.org's avatar
ap@webkit.org committed
548
            propertyNames.add(Identifier::from(exec, it->first));
darin's avatar
darin committed
549
    }
550

551 552 553 554
    if (mode == IncludeDontEnumProperties)
        propertyNames.add(exec->propertyNames().length);

    JSObject::getOwnPropertyNames(exec, propertyNames, mode);
darin's avatar
darin committed
555 556
}

557 558 559 560 561
ALWAYS_INLINE unsigned JSArray::getNewVectorLength(unsigned desiredLength)
{
    ASSERT(desiredLength <= MAX_STORAGE_VECTOR_LENGTH);

    unsigned increasedLength;
562
    unsigned maxInitLength = min(m_storage->m_length, 100000U);
563

564 565
    if (desiredLength < maxInitLength)
        increasedLength = maxInitLength;
566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583
    else if (!m_vectorLength)
        increasedLength = max(desiredLength, lastArraySize);
    else {
        // Mathematically equivalent to:
        //   increasedLength = (newLength * 3 + 1) / 2;
        // or:
        //   increasedLength = (unsigned)ceil(newLength * 1.5));
        // This form is not prone to internal overflow.
        increasedLength = desiredLength + (desiredLength >> 1) + (desiredLength & 1);
    }

    ASSERT(increasedLength >= desiredLength);

    lastArraySize = min(increasedLength, FIRST_VECTOR_GROW);

    return min(increasedLength, MAX_STORAGE_VECTOR_LENGTH);
}

darin@apple.com's avatar
darin@apple.com committed
584
bool JSArray::increaseVectorLength(unsigned newLength)
darin's avatar
darin committed
585
{
ap@webkit.org's avatar
ap@webkit.org committed
586 587 588
    // This function leaves the array in an internally inconsistent state, because it does not move any values from sparse value map
    // to the vector. Callers have to account for that, because they can do it more efficiently.

589
    ArrayStorage* storage = m_storage;
darin's avatar
darin committed
590

591
    unsigned vectorLength = m_vectorLength;
darin's avatar
darin committed
592
    ASSERT(newLength > vectorLength);
barraclough@apple.com's avatar
barraclough@apple.com committed
593
    ASSERT(newLength <= MAX_STORAGE_VECTOR_INDEX);
594
    unsigned newVectorLength = getNewVectorLength(newLength);
595
    void* baseStorage = storage->m_allocBase;
darin's avatar
darin committed
596

597
    if (!tryFastRealloc(baseStorage, storageSize(newVectorLength + m_indexBias)).getValue(baseStorage))
ap@webkit.org's avatar
ap@webkit.org committed
598
        return false;
599

600
    storage = m_storage = reinterpret_cast_ptr<ArrayStorage*>(static_cast<char*>(baseStorage) + m_indexBias * sizeof(JSValue));
601
    m_storage->m_allocBase = baseStorage;
602

603
    WriteBarrier<Unknown>* vector = storage->m_vector;
604
    for (unsigned i = vectorLength; i < newVectorLength; ++i)
605
        vector[i].clear();
ap@webkit.org's avatar
ap@webkit.org committed
606

607
    m_vectorLength = newVectorLength;
608 609
    
    Heap::heap(this)->reportExtraMemoryCost(storageSize(newVectorLength) - storageSize(vectorLength));
darin's avatar
darin committed
610

611 612
    return true;
}
darin's avatar
darin committed
613

614 615 616 617 618
bool JSArray::increaseVectorPrefixLength(unsigned newLength)
{
    // This function leaves the array in an internally inconsistent state, because it does not move any values from sparse value map
    // to the vector. Callers have to account for that, because they can do it more efficiently.
    
619
    ArrayStorage* storage = m_storage;
620 621 622 623 624
    
    unsigned vectorLength = m_vectorLength;
    ASSERT(newLength > vectorLength);
    ASSERT(newLength <= MAX_STORAGE_VECTOR_INDEX);
    unsigned newVectorLength = getNewVectorLength(newLength);
625 626

    void* newBaseStorage = fastMalloc(storageSize(newVectorLength + m_indexBias));
627 628 629 630 631
    if (!newBaseStorage)
        return false;
    
    m_indexBias += newVectorLength - newLength;
    
632
    m_storage = reinterpret_cast_ptr<ArrayStorage*>(static_cast<char*>(newBaseStorage) + m_indexBias * sizeof(JSValue));
633

634 635
    memcpy(m_storage, storage, storageSize(0));
    memcpy(&m_storage->m_vector[newLength - m_vectorLength], &storage->m_vector[0], vectorLength * sizeof(JSValue));
636
    
637
    m_storage->m_allocBase = newBaseStorage;
638 639
    m_vectorLength = newLength;
    
640
    fastFree(storage->m_allocBase);
641 642

    Heap::heap(this)->reportExtraMemoryCost(storageSize(newVectorLength) - storageSize(vectorLength));
643
    
ap@webkit.org's avatar
ap@webkit.org committed
644
    return true;
darin's avatar
darin committed
645
}
646
    
darin's avatar
darin committed
647

darin@apple.com's avatar
darin@apple.com committed
648
void JSArray::setLength(unsigned newLength)
darin's avatar
darin committed
649
{
650 651
    ArrayStorage* storage = m_storage;
    
652
#if CHECK_ARRAY_CONSISTENCY
653
    if (!storage->m_inCompactInitialization)
654 655
        checkConsistency();
    else
656
        storage->m_inCompactInitialization = false;
657
#endif
658

659
    unsigned length = storage->m_length;
darin's avatar
darin committed
660 661

    if (newLength < length) {
662
        unsigned usedVectorLength = min(length, m_vectorLength);
darin's avatar
darin committed
663
        for (unsigned i = newLength; i < usedVectorLength; ++i) {
664
            WriteBarrier<Unknown>& valueSlot = storage->m_vector[i];
darin's avatar
darin committed
665
            bool hadValue = valueSlot;
666
            valueSlot.clear();
darin's avatar
darin committed
667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682
            storage->m_numValuesInVector -= hadValue;
        }

        if (SparseArrayValueMap* map = storage->m_sparseValueMap) {
            SparseArrayValueMap copy = *map;
            SparseArrayValueMap::iterator end = copy.end();
            for (SparseArrayValueMap::iterator it = copy.begin(); it != end; ++it) {
                if (it->first >= newLength)
                    map->remove(it->first);
            }
            if (map->isEmpty()) {
                delete map;
                storage->m_sparseValueMap = 0;
            }
        }
    }
aroben@apple.com's avatar
aroben@apple.com committed
683

684
    storage->m_length = newLength;
685 686

    checkConsistency();
darin's avatar
darin committed
687 688
}

ggaren@apple.com's avatar
ggaren@apple.com committed
689
JSValue JSArray::pop()
690 691 692
{
    checkConsistency();

693
    ArrayStorage* storage = m_storage;
694 695
    
    unsigned length = storage->m_length;
696 697 698 699 700
    if (!length)
        return jsUndefined();

    --length;

ggaren@apple.com's avatar
ggaren@apple.com committed
701
    JSValue result;
702

703
    if (length < m_vectorLength) {
704
        WriteBarrier<Unknown>& valueSlot = storage->m_vector[length];
705
        if (valueSlot) {
706
            --storage->m_numValuesInVector;
707 708
            result = valueSlot.get();
            valueSlot.clear();
709
        } else
710 711 712
            result = jsUndefined();
    } else {
        result = jsUndefined();
713
        if (SparseArrayValueMap* map = storage->m_sparseValueMap) {
714 715
            SparseArrayValueMap::iterator it = map->find(length);
            if (it != map->end()) {
716
                result = it->second.get();
717 718 719
                map->remove(it);
                if (map->isEmpty()) {
                    delete map;
720
                    storage->m_sparseValueMap = 0;
721 722 723 724 725
                }
            }
        }
    }

726
    storage->m_length = length;
727 728 729 730 731 732

    checkConsistency();

    return result;
}

ggaren@apple.com's avatar
ggaren@apple.com committed
733
void JSArray::push(ExecState* exec, JSValue value)
734 735
{
    checkConsistency();
736
    
737
    ArrayStorage* storage = m_storage;
738

739 740 741 742 743 744
    if (UNLIKELY(storage->m_length == 0xFFFFFFFFu)) {
        put(exec, storage->m_length, value);
        throwError(exec, createRangeError(exec, "Invalid array length"));
        return;
    }

745
    if (storage->m_length < m_vectorLength) {
746
        storage->m_vector[storage->m_length].set(exec->globalData(), this, value);
747 748
        ++storage->m_numValuesInVector;
        ++storage->m_length;
749 750 751 752
        checkConsistency();
        return;
    }

753 754
    if (storage->m_length < MIN_SPARSE_ARRAY_INDEX) {
        SparseArrayValueMap* map = storage->m_sparseValueMap;
755
        if (!map || map->isEmpty()) {
756
            if (increaseVectorLength(storage->m_length + 1)) {
757
                storage = m_storage;
758
                storage->m_vector[storage->m_length].set(exec->globalData(), this, value);
759 760
                ++storage->m_numValuesInVector;
                ++storage->m_length;
761 762 763 764 765 766 767 768 769
                checkConsistency();
                return;
            }
            checkConsistency();
            throwOutOfMemoryError(exec);
            return;
        }
    }

770 771 772 773 774 775 776
    putSlowCase(exec, storage->m_length++, value);
}

void JSArray::shiftCount(ExecState* exec, int count)
{
    ASSERT(count > 0);
    
777
    ArrayStorage* storage = m_storage;
778 779 780 781 782 783 784 785 786 787 788 789
    
    unsigned oldLength = storage->m_length;
    
    if (!oldLength)
        return;
    
    if (oldLength != storage->m_numValuesInVector) {
        // If m_length and m_numValuesInVector aren't the same, we have a sparse vector
        // which means we need to go through each entry looking for the the "empty"
        // slots and then fill them with possible properties.  See ECMA spec.
        // 15.4.4.9 steps 11 through 13.
        for (unsigned i = count; i < oldLength; ++i) {
790
            if ((i >= m_vectorLength) || (!m_storage->m_vector[i])) {
791 792 793 794 795 796 797
                PropertySlot slot(this);
                JSValue p = prototype();
                if ((!p.isNull()) && (asObject(p)->getPropertySlot(exec, i, slot)))
                    put(exec, i, slot.getValue(exec, i));
            }
        }

798
        storage = m_storage; // The put() above could have grown the vector and realloc'ed storage.
799 800 801

        // Need to decrement numValuesInvector based on number of real entries
        for (unsigned i = 0; i < (unsigned)count; ++i)
802
            if ((i < m_vectorLength) && (storage->m_vector[i]))
803 804 805