Changeset 37400 in webkit

Timestamp:

Oct 7, 2008 4:49:59 PM (16 years ago)

Author:

weinig@apple.com

Message:

2008-10-07 Sam Weinig <​sam@webkit.org>

Reviewed by Cameron Zwarich.

Move hasGetterSetterProperties flag from PropertyMap to StructureID.

• kjs/JSObject.cpp: (JSC::JSObject::put): (JSC::JSObject::defineGetter): (JSC::JSObject::defineSetter):
• kjs/JSObject.h: (JSC::JSObject::hasGetterSetterProperties): (JSC::JSObject::getOwnPropertySlotForWrite): (JSC::JSObject::getOwnPropertySlot):
• kjs/PropertyMap.h:
• kjs/StructureID.cpp: (JSC::StructureID::StructureID): (JSC::StructureID::addPropertyTransition): (JSC::StructureID::toDictionaryTransition): (JSC::StructureID::changePrototypeTransition): (JSC::StructureID::getterSetterTransition):
• kjs/StructureID.h: (JSC::StructureID::hasGetterSetterProperties): (JSC::StructureID::setHasGetterSetterProperties):

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• kjs/JSObject.cpp (modified) (5 diffs)
• kjs/JSObject.h (modified) (3 diffs)
• kjs/PropertyMap.h (modified) (2 diffs)
• kjs/StructureID.cpp (modified) (5 diffs)
• kjs/StructureID.h (modified) (2 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-10-07  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Cameron Zwarich.
+
+        Move hasGetterSetterProperties flag from PropertyMap to StructureID.
+
+        * kjs/JSObject.cpp:
+        (JSC::JSObject::put):
+        (JSC::JSObject::defineGetter):
+        (JSC::JSObject::defineSetter):
+        * kjs/JSObject.h:
+        (JSC::JSObject::hasGetterSetterProperties):
+        (JSC::JSObject::getOwnPropertySlotForWrite):
+        (JSC::JSObject::getOwnPropertySlot):
+        * kjs/PropertyMap.h:
+        * kjs/StructureID.cpp:
+        (JSC::StructureID::StructureID):
+        (JSC::StructureID::addPropertyTransition):
+        (JSC::StructureID::toDictionaryTransition):
+        (JSC::StructureID::changePrototypeTransition):
+        (JSC::StructureID::getterSetterTransition):
+        * kjs/StructureID.h:
+        (JSC::StructureID::hasGetterSetterProperties):
+        (JSC::StructureID::setHasGetterSetterProperties):
+
 2008-10-07  Sam Weinig  <sam@webkit.org>
 

trunk/JavaScriptCore/kjs/JSObject.cpp

@@ -126 +126 @@
     // Check if there are any setters or getters in the prototype chain
     JSValue* prototype;
-    for (JSObject* obj = this; !obj->structureID()->propertyMap().hasGetterSetterProperties(); obj = static_cast<JSObject*>(prototype)) {
+    for (JSObject* obj = this; !obj->structureID()->hasGetterSetterProperties(); obj = static_cast<JSObject*>(prototype)) {
         prototype = obj->prototype();
         if (prototype->isNull()) {
@@ -293 +293 @@
     JSValue* object = getDirect(propertyName);
     if (object && object->isGetterSetter()) {
-        ASSERT(m_structureID->propertyMap().hasGetterSetterProperties());
+        ASSERT(m_structureID->hasGetterSetterProperties());
         GetterSetter* getterSetter = static_cast<GetterSetter*>(object);
         getterSetter->setGetter(getterFunction);
@@ -313 +313 @@
     }
 
-    m_structureID->propertyMap().setHasGetterSetterProperties(true);
+    m_structureID->setHasGetterSetterProperties(true);
     getterSetter->setGetter(getterFunction);
 }
@@ -321 +321 @@
     JSValue* object = getDirect(propertyName);
     if (object && object->isGetterSetter()) {
-        ASSERT(m_structureID->propertyMap().hasGetterSetterProperties());
+        ASSERT(m_structureID->hasGetterSetterProperties());
         GetterSetter* getterSetter = static_cast<GetterSetter*>(object);
         getterSetter->setSetter(setterFunction);
@@ -341 +341 @@
     }
 
-    m_structureID->propertyMap().setHasGetterSetterProperties(true);
+    m_structureID->setHasGetterSetterProperties(true);
     getterSetter->setSetter(setterFunction);
 }

trunk/JavaScriptCore/kjs/JSObject.h

@@ -153 +153 @@
         void removeDirect(const Identifier& propertyName);
         bool hasCustomProperties() { return !m_structureID->propertyMap().isEmpty(); }
-        bool hasGetterSetterProperties() { return m_structureID->propertyMap().hasGetterSetterProperties(); }
+        bool hasGetterSetterProperties() { return m_structureID->hasGetterSetterProperties(); }
 
         void putDirect(const Identifier& propertyName, JSValue* value, unsigned attr = 0);
@@ -314 +314 @@
     unsigned attributes;
     if (JSValue** location = getDirectLocation(propertyName, attributes)) {
-        if (m_structureID->propertyMap().hasGetterSetterProperties() && location[0]->isGetterSetter()) {
+        if (m_structureID->hasGetterSetterProperties() && location[0]->isGetterSetter()) {
             slotIsWriteable = false;
             fillGetterPropertySlot(slot, location);
@@ -340 +340 @@
 {
     if (JSValue** location = getDirectLocation(propertyName)) {
-        if (m_structureID->propertyMap().hasGetterSetterProperties() && location[0]->isGetterSetter())
+        if (m_structureID->hasGetterSetterProperties() && location[0]->isGetterSetter())
             fillGetterPropertySlot(slot, location);
         else

trunk/JavaScriptCore/kjs/PropertyMap.h

@@ -95 +95 @@
         PropertyMap& operator=(const PropertyMap&);
 
-
         size_t get(const Identifier& propertyName);
         size_t get(const Identifier& propertyName, unsigned& attributes);
@@ -102 +101 @@
 
         void getEnumerablePropertyNames(PropertyNameArray&) const;
-
-        bool hasGetterSetterProperties() const { return m_getterSetterFlag; }
-        void setHasGetterSetterProperties(bool f) { m_getterSetterFlag = f; }
 
         bool isEmpty() { return !m_table; }

trunk/JavaScriptCore/kjs/StructureID.cpp

@@ -40 +40 @@
     : m_typeInfo(typeInfo)
     , m_isDictionary(false)
+    , m_hasGetterSetterProperties(false)
     , m_prototype(prototype)
     , m_cachedPrototypeChain(0)
@@ -139 +140 @@
     transition->m_propertyMap = structureID->m_propertyMap;
     transition->m_propertyStorageCapacity = structureID->m_propertyStorageCapacity;
+    transition->m_hasGetterSetterProperties = structureID->m_hasGetterSetterProperties;
 
     offset = transition->m_propertyMap.put(propertyName, attributes);
@@ -158 +160 @@
     transition->m_propertyMap = structureID->m_propertyMap;
     transition->m_propertyStorageCapacity = structureID->m_propertyStorageCapacity;
+    transition->m_hasGetterSetterProperties = structureID->m_hasGetterSetterProperties;
     return transition.release();
 }
@@ -178 +181 @@
     transition->m_propertyMap = structureID->m_propertyMap;
     transition->m_propertyStorageCapacity = structureID->m_propertyStorageCapacity;
+    transition->m_hasGetterSetterProperties = structureID->m_hasGetterSetterProperties;
     return transition.release();
 }
@@ -187 +191 @@
     transition->m_propertyMap = structureID->m_propertyMap;
     transition->m_propertyStorageCapacity = structureID->m_propertyStorageCapacity;
+    transition->m_hasGetterSetterProperties = transition->m_hasGetterSetterProperties;
     return transition.release();
 }

trunk/JavaScriptCore/kjs/StructureID.h

@@ -125 +125 @@
         void clearEnumerationCache();
 
+        bool hasGetterSetterProperties() const { return m_hasGetterSetterProperties; }
+        void setHasGetterSetterProperties(bool hasGetterSetterProperties) { m_hasGetterSetterProperties = hasGetterSetterProperties; }
+
     private:
         typedef std::pair<RefPtr<UString::Rep>, unsigned> TransitionTableKey;
@@ -136 +139 @@
 
         bool m_isDictionary;
+
+        bool m_hasGetterSetterProperties;
 
         JSValue* m_prototype;