Changeset 44757 in webkit for trunk/JavaScriptCore/runtime/JSObject.h

Timestamp:

Jun 17, 2009, 2:11:05 AM (16 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

2009-06-17 Gavin Barraclough <​[email protected]>

Reviewed by Oliver Hunt.

<rdar://problem/6974175> ASSERT in JITStubs.cpp at appsaccess.apple.com

Remove PropertySlot::putValue - PropertySlots should only be used for getting,
not putting. Rename JSGlobalObject::getOwnPropertySlot to hasOwnPropertyForWrite,
which is what it really was being used to ask, and remove some other getOwnPropertySlot
& getOwnPropertySlotForWrite methods, which were unused and likely to lead to confusion.

• runtime/JSGlobalObject.h: (JSC::JSGlobalObject::hasOwnPropertyForWrite):
• runtime/JSObject.h:
• runtime/JSStaticScopeObject.cpp:
• runtime/JSStaticScopeObject.h:
• runtime/PropertySlot.h:

WebCore:

2009-06-17 Gavin Barraclough <​[email protected]>

Reviewed by Oliver Hunt.

<rdar://problem/6974175> ASSERT in JITStubs.cpp at appsaccess.apple.com

JSDOMWindowCustom was using PropertySlot::putValue, however this interface
appears to be fundaementally incorrect - PropertySlots are only used to get
values, all puts use PutPropertySlot. However PutPropertySlot cannot be
used in the fashion desired here - it only reports the caching type of a
write that has been performed.

(This caused a bug where the put should have triggered a transition, and
failed to do so.)

Removing the faulty case from the optimization leads to a ~0.5% progression
on in-browser SunSpider (presumably the very first case was not being hit
often, and the simplification here is beneficial).

• bindings/js/JSDOMWindowCustom.cpp: (WebCore::JSDOMWindow::put):

File:

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

trunk/JavaScriptCore/runtime/JSObject.h

@@ -204 +204 @@
         }
 
-    protected:
-        bool getOwnPropertySlotForWrite(ExecState*, const Identifier&, PropertySlot&, bool& slotIsWriteable);
-
     private:
         ConstPropertyStorage propertyStorage() const { return (isUsingInlineStorage() ? m_inlineStorage : m_externalStorage); }
@@ -323 +320 @@
     if (propertyName == exec->propertyNames().underscoreProto) {
         slot.setValue(prototype());
-        return true;
-    }
-
-    return false;
-}
-
-ALWAYS_INLINE bool JSObject::getOwnPropertySlotForWrite(ExecState* exec, const Identifier& propertyName, PropertySlot& slot, bool& slotIsWriteable)
-{
-    unsigned attributes;
-    if (JSValue* location = getDirectLocation(propertyName, attributes)) {
-        if (m_structure->hasGetterSetterProperties() && location[0].isGetterSetter()) {
-            slotIsWriteable = false;
-            fillGetterPropertySlot(slot, location);
-        } else {
-            slotIsWriteable = !(attributes & ReadOnly);
-            slot.setValueSlot(this, location, offsetForLocation(location));
-        }
-        return true;
-    }
-
-    // non-standard Netscape extension
-    if (propertyName == exec->propertyNames().underscoreProto) {
-        slot.setValue(prototype());
-        slotIsWriteable = false;
         return true;
     }