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

Timestamp:

Jan 20, 2015, 2:43:06 PM (10 years ago)

Author:

[email protected]

Message:

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

Caused 32-bit JSC test failures (Requested by JoePeck on
#webkit).

Reverted changeset:

"put_by_val_direct need to check the property is index or not
for using putDirect / putDirectIndex"
​https://bugs.webkit.org/show_bug.cgi?id=140426
​http://trac.webkit.org/changeset/178751

File:

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

trunk/Source/JavaScriptCore/runtime/JSObject.cpp

@@ -340 +340 @@
     // Try indexed put first. This is required for correctness, since loads on property names that appear like
     // valid indices will never look in the named property storage.
-    if (Optional<uint32_t> index = propertyName.asIndex()) {
-        putByIndex(thisObject, exec, index.value(), value, slot.isStrictMode());
+    unsigned i = propertyName.asIndex();
+    if (i != PropertyName::NotAnIndex) {
+        putByIndex(thisObject, exec, i, value, slot.isStrictMode());
         return;
     }
@@ -1198 +1199 @@
     ASSERT(value.isGetterSetter() && (attributes & Accessor));
 
-    if (Optional<uint32_t> index = propertyName.asIndex()) {
-        putDirectIndex(exec, index.value(), value, attributes, PutDirectIndexLikePutDirect);
+    unsigned index = propertyName.asIndex();
+    if (index != PropertyName::NotAnIndex) {
+        putDirectIndex(exec, index, value, attributes, PutDirectIndexLikePutDirect);
         return;
     }
@@ -1208 +1210 @@
 void JSObject::putDirectCustomAccessor(VM& vm, PropertyName propertyName, JSValue value, unsigned attributes)
 {
-    ASSERT(!propertyName.asIndex());
+    ASSERT(propertyName.asIndex() == PropertyName::NotAnIndex);
 
     PutPropertySlot slot(this);
@@ -1256 +1258 @@
     JSObject* thisObject = jsCast<JSObject*>(cell);
     
-    if (Optional<uint32_t> index = propertyName.asIndex())
-        return thisObject->methodTable(exec->vm())->deletePropertyByIndex(thisObject, exec, index.value());
+    unsigned i = propertyName.asIndex();
+    if (i != PropertyName::NotAnIndex)
+        return thisObject->methodTable(exec->vm())->deletePropertyByIndex(thisObject, exec, i);
 
     if (!thisObject->staticFunctionsReified())
@@ -2500 +2503 @@
 void JSObject::putDirectMayBeIndex(ExecState* exec, PropertyName propertyName, JSValue value)
 {
-    if (Optional<uint32_t> index = propertyName.asIndex())
-        putDirectIndex(exec, index.value(), value);
+    unsigned asIndex = propertyName.asIndex();
+    if (asIndex == PropertyName::NotAnIndex)
+        putDirect(exec->vm(), propertyName, value);
     else
-        putDirect(exec->vm(), propertyName, value);
+        putDirectIndex(exec, asIndex, value);
 }
 
@@ -2656 +2660 @@
 {
     // If it's an array index, then use the indexed property storage.
-    if (Optional<uint32_t> index = propertyName.asIndex()) {
+    unsigned index = propertyName.asIndex();
+    if (index != PropertyName::NotAnIndex) {
         // c. Let succeeded be the result of calling the default [[DefineOwnProperty]] internal method (8.12.9) on A passing P, Desc, and false as arguments.
         // d. Reject if succeeded is false.
@@ -2663 +2668 @@
         // e.ii. Call the default [[DefineOwnProperty]] internal method (8.12.9) on A passing "length", oldLenDesc, and false as arguments. This call will always return true.
         // f. Return true.
-        return object->defineOwnIndexedProperty(exec, index.value(), descriptor, throwException);
+        return object->defineOwnIndexedProperty(exec, index, descriptor, throwException);
     }