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

Timestamp:

Dec 25, 2013, 4:29:42 PM (12 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r161033 and r161074.
​http://trac.webkit.org/changeset/161033
​http://trac.webkit.org/changeset/161074
​https://bugs.webkit.org/show_bug.cgi?id=126240

Oliver says that a rollout would be better (Requested by ap on
#webkit).

Source/JavaScriptCore:

• API/JSObjectRef.cpp:

(JSObjectSetProperty):

• dfg/DFGOperations.cpp:

(JSC::DFG::operationPutByValInternal):

• interpreter/Interpreter.cpp:

(JSC::Interpreter::execute):

• jit/JITOperations.cpp:
• llint/LLIntSlowPaths.cpp:

(JSC::LLInt::LLINT_SLOW_PATH_DECL):

• runtime/Arguments.cpp:

(JSC::Arguments::putByIndex):

• runtime/ArrayPrototype.cpp:

(JSC::putProperty):
(JSC::arrayProtoFuncPush):

• runtime/JSCJSValue.cpp:

(JSC::JSValue::putToPrimitiveByIndex):

• runtime/JSCell.cpp:

(JSC::JSCell::putByIndex):

• runtime/JSFunction.cpp:

(JSC::JSFunction::put):

• runtime/JSGenericTypedArrayViewInlines.h:

(JSC::JSGenericTypedArrayView<Adaptor>::putByIndex):

• runtime/JSONObject.cpp:

(JSC::Walker::walk):

• runtime/JSObject.cpp:

(JSC::JSObject::putByIndex):
(JSC::JSObject::putDirectNonIndexAccessor):
(JSC::JSObject::deleteProperty):

• runtime/JSObject.h:

(JSC::JSObject::putDirect):

• runtime/Lookup.h:

(JSC::putEntry):
(JSC::lookupPut):

• runtime/PutPropertySlot.h:

(JSC::PutPropertySlot::PutPropertySlot):
(JSC::PutPropertySlot::setNewProperty):
(JSC::PutPropertySlot::isCacheable):

Source/WebCore:

• bindings/js/JSDOMWindowCustom.cpp:

(WebCore::JSDOMWindow::put):

• bindings/objc/WebScriptObject.mm:

(-[WebScriptObject setValue:forKey:]):

• bindings/scripts/CodeGeneratorJS.pm:

(GenerateImplementation):

• bindings/scripts/test/JS/JSTestInterface.cpp:

(WebCore::JSTestInterface::putByIndex):

• bridge/NP_jsobject.cpp:

(_NPN_SetProperty):

Source/WebKit/mac:

• Plugins/Hosted/NetscapePluginInstanceProxy.mm:

(WebKit::NetscapePluginInstanceProxy::setProperty):

Source/WebKit2:

• WebProcess/Plugins/Netscape/NPJSObject.cpp:

(WebKit::NPJSObject::setProperty):

LayoutTests:

• TestExpectations:

File:

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

trunk/Source/JavaScriptCore/runtime/JSObject.cpp

@@ -412 +412 @@
     
     if (propertyName > MAX_ARRAY_INDEX) {
-        PutPropertySlot slot(cell, shouldThrow);
+        PutPropertySlot slot(shouldThrow);
         thisObject->methodTable()->put(thisObject, exec, Identifier::from(exec, propertyName), value, slot);
         return;
@@ -1216 +1216 @@
 void JSObject::putDirectNonIndexAccessor(VM& vm, PropertyName propertyName, JSValue value, unsigned attributes)
 {
-    PutPropertySlot slot(this);
+    PutPropertySlot slot;
     putDirectInternal<PutModeDefineOwnProperty>(vm, propertyName, value, attributes, slot, getCallableObject(value));
 
@@ -1270 +1270 @@
             return false; // this builtin property can't be deleted
 
-        PutPropertySlot slot(thisObject);
-        putEntry(exec, entry, propertyName, jsUndefined(), slot);
+        putEntry(exec, entry, propertyName, jsUndefined(), thisObject);
     }