Changeset 178928 in webkit for trunk/Source/JavaScriptCore/runtime/JSObject.h

Timestamp:

Jan 22, 2015, 11:34:34 AM (10 years ago)

Author:

[email protected]

Message:

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

Broke JSC and bindings tests (Requested by ap_ 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/178894

File:

• trunk/Source/JavaScriptCore/runtime/JSObject.h (modified) (3 diffs)

trunk/Source/JavaScriptCore/runtime/JSObject.h

@@ -1245 +1245 @@
     if (object->inlineGetOwnPropertySlot(vm, structure, propertyName, slot))
         return true;
-    if (Optional<uint32_t> index = propertyName.asIndex())
-        return getOwnPropertySlotByIndex(object, exec, index.value(), slot);
+    unsigned index = propertyName.asIndex();
+    if (index != PropertyName::NotAnIndex)
+        return getOwnPropertySlotByIndex(object, exec, index, slot);
     return false;
 }
@@ -1274 +1275 @@
     }
 
-    if (Optional<uint32_t> index = propertyName.asIndex())
-        return getPropertySlot(exec, index.value(), slot);
+    unsigned index = propertyName.asIndex();
+    if (index != PropertyName::NotAnIndex)
+        return getPropertySlot(exec, index, slot);
     return false;
 }
@@ -1319 +1321 @@
     ASSERT(value.isGetterSetter() == !!(attributes & Accessor));
     ASSERT(!Heap::heap(value) || Heap::heap(value) == Heap::heap(this));
-    ASSERT(!propertyName.asIndex());
+    ASSERT(propertyName.asIndex() == PropertyName::NotAnIndex);
 
     Structure* structure = this->structure(vm);