Changeset 128428 in webkit for trunk/Source/JavaScriptCore/runtime/JSObject.cpp

Timestamp:

Sep 13, 2012, 1:43:33 AM (13 years ago)

Author:

[email protected]

Message:

[Qt][Win] REGRESSION(r128400): It broke the build
​https://bugs.webkit.org/show_bug.cgi?id=96617

Patch by Filip Pizlo <​[email protected]> on 2012-09-13
Reviewed by Simon Hausmann.

Source/JavaScriptCore:

Changed "JSC::Array" to "JSC::ArrayClass" because it's not used often enough
for the brevity to be beneficial, and because "Array" causes too much namespace
pollution.

• runtime/IndexingType.h:

(JSC):

• runtime/JSArray.cpp:

(JSC::JSArray::pop):
(JSC::JSArray::push):
(JSC::JSArray::sortNumeric):
(JSC::JSArray::sort):
(JSC::JSArray::fillArgList):
(JSC::JSArray::copyToArguments):
(JSC::JSArray::compactForSorting):

• runtime/JSObject.cpp:

(JSC::JSObject::getOwnPropertySlotByIndex):
(JSC::JSObject::putByIndex):
(JSC::JSObject::ensureArrayStorageExistsAndEnterDictionaryIndexingMode):
(JSC::JSObject::deletePropertyByIndex):
(JSC::JSObject::getOwnPropertyNames):
(JSC::JSObject::putByIndexBeyondVectorLength):
(JSC::JSObject::putDirectIndexBeyondVectorLength):
(JSC::JSObject::getNewVectorLength):
(JSC::JSObject::getOwnPropertyDescriptor):

• runtime/JSObject.h:

(JSC::JSObject::getArrayLength):
(JSC::JSObject::getVectorLength):
(JSC::JSObject::canGetIndexQuickly):
(JSC::JSObject::canSetIndexQuickly):
(JSC::JSObject::inSparseIndexingMode):
(JSC::JSObject::ensureArrayStorage):

Source/WebCore:

• bridge/runtime_array.h:

(JSC::RuntimeArray::createStructure):

File:

• trunk/Source/JavaScriptCore/runtime/JSObject.cpp (modified) (10 diffs)

trunk/Source/JavaScriptCore/runtime/JSObject.cpp

@@ -236 +236 @@
     switch (thisObject->structure()->indexingType()) {
     case NonArray:
-    case Array:
+    case ArrayClass:
         break;
         
@@ -356 +356 @@
     switch (thisObject->structure()->indexingType()) {
     case NonArray:
-    case Array:
+    case ArrayClass:
         break;
         
@@ -439 +439 @@
 {
     IndexingType oldType = structure()->indexingType();
-    ASSERT_UNUSED(oldType, oldType == NonArray || oldType == Array);
+    ASSERT_UNUSED(oldType, oldType == NonArray || oldType == ArrayClass);
     Butterfly* newButterfly = m_butterfly->growArrayRight(
         globalData, structure(), structure()->outOfLineCapacity(), false, 0,
@@ -472 +472 @@
         return enterDictionaryIndexingModeWhenArrayStorageAlreadyExists(globalData, m_butterfly->arrayStorage());
         
-    case Array:
+    case ArrayClass:
     case NonArray: {
         createArrayStorage(globalData, 0, 0);
@@ -598 +598 @@
     
     switch (thisObject->structure()->indexingType()) {
-    case Array:
+    case ArrayClass:
     case NonArray:
         return true;
@@ -764 +764 @@
     switch (object->structure()->indexingType()) {
     case NonArray:
-    case Array:
+    case ArrayClass:
         break;
         
@@ -1191 +1191 @@
     switch (structure()->indexingType()) {
     case NonArray:
-    case Array: {
+    case ArrayClass: {
         if (indexingShouldBeSparse()) {
             putByIndexBeyondVectorLengthWithArrayStorage(exec, i, value, shouldThrow, ensureArrayStorageExistsAndEnterDictionaryIndexingMode(globalData));
@@ -1300 +1300 @@
     switch (structure()->indexingType()) {
     case NonArray:
-    case Array: {
+    case ArrayClass: {
         if (indexingShouldBeSparse() || attributes)
             return putDirectIndexBeyondVectorLengthWithArrayStorage(exec, i, value, attributes, mode, ensureArrayStorageExistsAndEnterDictionaryIndexingMode(globalData));
@@ -1356 +1356 @@
     switch (structure()->indexingType()) {
     case NonArray:
-    case Array:
+    case ArrayClass:
         vectorLength = 0;
         length = 0;
@@ -1480 +1480 @@
     switch (object->structure()->indexingType()) {
     case NonArray:
-    case Array:
+    case ArrayClass:
         return false;