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

Timestamp:

Oct 7, 2011, 11:37:45 PM (14 years ago)

Author:

[email protected]

Message:

Add static version of JSCell::deleteProperty
​https://bugs.webkit.org/show_bug.cgi?id=69659

Reviewed by Geoffrey Garen.

Source/JavaScriptCore:

Added static version of both versions of put to all classes that
override them and changed the virtual versions to call the static
versions. This is the first step in de-virtualizing JSCell::deleteProperty.

• API/JSCallbackObject.h:
• API/JSCallbackObjectFunctions.h:

(JSC::::deleteProperty):

• debugger/DebuggerActivation.cpp:

(JSC::DebuggerActivation::deleteProperty):

• debugger/DebuggerActivation.h:
• runtime/Arguments.cpp:

(JSC::Arguments::deleteProperty):

• runtime/Arguments.h:
• runtime/JSActivation.cpp:

(JSC::JSActivation::deleteProperty):

• runtime/JSActivation.h:
• runtime/JSArray.cpp:

(JSC::JSArray::deleteProperty):

• runtime/JSArray.h:
• runtime/JSCell.cpp:

(JSC::JSCell::deleteProperty):

• runtime/JSCell.h:
• runtime/JSFunction.cpp:

(JSC::JSFunction::deleteProperty):

• runtime/JSFunction.h:
• runtime/JSNotAnObject.cpp:

(JSC::JSNotAnObject::deleteProperty):

• runtime/JSNotAnObject.h:
• runtime/JSObject.cpp:

(JSC::JSObject::deleteProperty):

• runtime/JSObject.h:
• runtime/JSVariableObject.cpp:

(JSC::JSVariableObject::deleteProperty):

• runtime/JSVariableObject.h:
• runtime/RegExpMatchesArray.h:

(JSC::RegExpMatchesArray::deleteProperty):

• runtime/StrictEvalActivation.cpp:

(JSC::StrictEvalActivation::deleteProperty):

• runtime/StrictEvalActivation.h:
• runtime/StringObject.cpp:

(JSC::StringObject::deleteProperty):

• runtime/StringObject.h:

Source/WebCore:

No new tests.

Added static version of both versions of put to all classes that
override them and changed the virtual versions to call the static
versions. This is the first step in de-virtualizing JSCell::deleteProperty.

• bridge/objc/objc_runtime.h:
• bridge/objc/objc_runtime.mm:

(JSC::Bindings::ObjcFallbackObjectImp::deleteProperty):

• bridge/runtime_array.cpp:

(JSC::RuntimeArray::deleteProperty):

• bridge/runtime_array.h:
• bridge/runtime_object.cpp:

(JSC::Bindings::RuntimeObject::deleteProperty):

• bridge/runtime_object.h:

File:

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

trunk/Source/JavaScriptCore/runtime/JSObject.cpp

@@ -243 +243 @@
 }
 
+bool JSObject::deleteProperty(ExecState* exec, const Identifier& propertyName)
+{
+    return deleteProperty(this, exec, propertyName);
+}
+
 // ECMA 8.6.2.5
-bool JSObject::deleteProperty(ExecState* exec, const Identifier& propertyName)
-{
+bool JSObject::deleteProperty(JSCell* cell, ExecState* exec, const Identifier& propertyName)
+{
+    JSObject* thisObject = static_cast<JSObject*>(cell);
     unsigned attributes;
     JSCell* specificValue;
-    if (structure()->get(exec->globalData(), propertyName, attributes, specificValue) != WTF::notFound) {
+    if (thisObject->structure()->get(exec->globalData(), propertyName, attributes, specificValue) != WTF::notFound) {
         if ((attributes & DontDelete))
             return false;
-        removeDirect(exec->globalData(), propertyName);
+        thisObject->removeDirect(exec->globalData(), propertyName);
         return true;
     }
 
     // Look in the static hashtable of properties
-    const HashEntry* entry = findPropertyHashEntry(exec, propertyName);
+    const HashEntry* entry = thisObject->findPropertyHashEntry(exec, propertyName);
     if (entry && entry->attributes() & DontDelete)
         return false; // this builtin property can't be deleted
@@ -272 +278 @@
 bool JSObject::deleteProperty(ExecState* exec, unsigned propertyName)
 {
-    return deleteProperty(exec, Identifier::from(exec, propertyName));
+    return deleteProperty(this, exec, propertyName);
+}
+
+bool JSObject::deleteProperty(JSCell* cell, ExecState* exec, unsigned propertyName)
+{
+    return static_cast<JSObject*>(cell)->deleteProperty(exec, Identifier::from(exec, propertyName));
 }