Changeset 178928 in webkit for trunk/Source/JavaScriptCore/dfg/DFGOperations.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/dfg/DFGOperations.cpp (modified) (3 diffs)

trunk/Source/JavaScriptCore/dfg/DFGOperations.cpp

@@ -98 +98 @@
 
     if (LIKELY(property.isUInt32())) {
-        uint32_t index = property.asUInt32();
-        ASSERT_WITH_MESSAGE(index != PropertyName::NotAnIndex, "Since JSValue::isUInt32 returns true only when the boxed value is int32_t and positive, it doesn't return true for uint32_t max value that is PropertyName::NotAnIndex.");
-        putByVal<strict, direct>(exec, baseValue, index, value);
+        putByVal<strict, direct>(exec, baseValue, property.asUInt32(), value);
         return;
     }
@@ -107 +105 @@
         double propertyAsDouble = property.asDouble();
         uint32_t propertyAsUInt32 = static_cast<uint32_t>(propertyAsDouble);
-        if (propertyAsDouble == propertyAsUInt32 && propertyAsUInt32 != PropertyName::NotAnIndex) {
+        if (propertyAsDouble == propertyAsUInt32) {
             putByVal<strict, direct>(exec, baseValue, propertyAsUInt32, value);
             return;
@@ -125 +123 @@
     // Don't put to an object if toString throws an exception.
     Identifier ident = property.toString(exec)->toIdentifier(exec);
-    if (vm->exception())
-        return;
-
-    PutPropertySlot slot(baseValue, strict);
-    if (direct) {
-        PropertyName propertyName(ident);
-        RELEASE_ASSERT(baseValue.isObject());
-        if (Optional<uint32_t> index = propertyName.asIndex())
-            asObject(baseValue)->putDirectIndex(exec, index.value(), value, 0, strict ? PutDirectIndexShouldThrow : PutDirectIndexShouldNotThrow);
-        else
-            asObject(baseValue)->putDirect(*vm, propertyName, value, slot);
-    } else
-        baseValue.put(exec, ident, value, slot);
+    if (!vm->exception()) {
+        PutPropertySlot slot(baseValue, strict);
+        if (direct) {
+            RELEASE_ASSERT(baseValue.isObject());
+            asObject(baseValue)->putDirect(*vm, ident, value, slot);
+        } else
+            baseValue.put(exec, ident, value, slot);
+    }
 }