Changeset 178928 in webkit for trunk/Source/JavaScriptCore/runtime/Arguments.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/Arguments.cpp (modified) (5 diffs)

trunk/Source/JavaScriptCore/runtime/Arguments.cpp

@@ -162 +162 @@
 {
     Arguments* thisObject = jsCast<Arguments*>(object);
-    if (Optional<uint32_t> index = propertyName.asIndex()) {
-        if (JSValue value = thisObject->tryGetArgument(index.value())) {
-            slot.setValue(thisObject, None, value);
-            return true;
-        }
+    unsigned i = propertyName.asIndex();
+    if (JSValue value = thisObject->tryGetArgument(i)) {
+        RELEASE_ASSERT(i < PropertyName::NotAnIndex);
+        slot.setValue(thisObject, None, value);
+        return true;
     }
 
@@ -225 +225 @@
 {
     Arguments* thisObject = jsCast<Arguments*>(cell);
-    Optional<uint32_t> index = propertyName.asIndex();
-    if (index && thisObject->trySetArgument(exec->vm(), index.value(), value))
+    unsigned i = propertyName.asIndex();
+    if (thisObject->trySetArgument(exec->vm(), i, value))
         return;
 
@@ -268 +268 @@
 
     Arguments* thisObject = jsCast<Arguments*>(cell);
-    Optional<uint32_t> index = propertyName.asIndex();
-    if (index && index.value() < thisObject->m_numArguments) {
+    unsigned i = propertyName.asIndex();
+    if (i < thisObject->m_numArguments) {
+        RELEASE_ASSERT(i < PropertyName::NotAnIndex);
         if (!Base::deleteProperty(cell, exec, propertyName))
             return false;
-        if (thisObject->tryDeleteArgument(exec->vm(), index.value()))
+        if (thisObject->tryDeleteArgument(exec->vm(), i))
             return true;
     }
@@ -298 +299 @@
 {
     Arguments* thisObject = jsCast<Arguments*>(object);
-    Optional<uint32_t> optionalIndex = propertyName.asIndex();
-    if (optionalIndex && optionalIndex.value() < thisObject->m_numArguments) {
+    unsigned i = propertyName.asIndex();
+    if (i < thisObject->m_numArguments) {
+        RELEASE_ASSERT(i < PropertyName::NotAnIndex);
         // If the property is not yet present on the object, and is not yet marked as deleted, then add it now.
-        uint32_t index = optionalIndex.value();
         PropertySlot slot(thisObject);
-        if (!thisObject->isDeletedArgument(index) && !JSObject::getOwnPropertySlot(thisObject, exec, propertyName, slot)) {
-            JSValue value = thisObject->tryGetArgument(index);
+        if (!thisObject->isDeletedArgument(i) && !JSObject::getOwnPropertySlot(thisObject, exec, propertyName, slot)) {
+            JSValue value = thisObject->tryGetArgument(i);
             ASSERT(value);
             object->putDirectMayBeIndex(exec, propertyName, value);
@@ -313 +314 @@
         // From ES 5.1, 10.6 Arguments Object
         // 5. If the value of isMapped is not undefined, then
-        if (thisObject->isArgument(index)) {
+        if (thisObject->isArgument(i)) {
             // a. If IsAccessorDescriptor(Desc) is true, then
             if (descriptor.isAccessorDescriptor()) {
                 // i. Call the [[Delete]] internal method of map passing P, and false as the arguments.
-                thisObject->tryDeleteArgument(exec->vm(), index);
+                thisObject->tryDeleteArgument(exec->vm(), i);
             } else { // b. Else
                 // i. If Desc.[[Value]] is present, then
                 // 1. Call the [[Put]] internal method of map passing P, Desc.[[Value]], and Throw as the arguments.
                 if (descriptor.value())
-                    thisObject->trySetArgument(exec->vm(), index, descriptor.value());
+                    thisObject->trySetArgument(exec->vm(), i, descriptor.value());
                 // ii. If Desc.[[Writable]] is present and its value is false, then
                 // 1. Call the [[Delete]] internal method of map passing P and false as arguments.
                 if (descriptor.writablePresent() && !descriptor.writable())
-                    thisObject->tryDeleteArgument(exec->vm(), index);
+                    thisObject->tryDeleteArgument(exec->vm(), i);
             }
         }