Changeset 178928 in webkit for trunk/Source/JavaScriptCore/runtime/JSString.cpp

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/JSString.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/runtime/JSString.cpp

@@ -426 +426 @@
     }
     
-    Optional<uint32_t> index = propertyName.asIndex();
-    if (index && index.value() < m_length) {
-        descriptor.setDescriptor(getIndex(exec, index.value()), DontDelete | ReadOnly);
+    unsigned i = propertyName.asIndex();
+    if (i < m_length) {
+        ASSERT(i != PropertyName::NotAnIndex); // No need for an explicit check, the above test would always fail!
+        descriptor.setDescriptor(getIndex(exec, i), DontDelete | ReadOnly);
         return true;
     }