Changeset 49726 in webkit for trunk/JavaScriptCore/runtime/Structure.cpp

Timestamp:

Oct 16, 2009, 7:31:42 PM (16 years ago)

Author:

[email protected]

Message:

Roll out r49717 as it broke the build.

File:

• trunk/JavaScriptCore/runtime/Structure.cpp (modified) (7 diffs)

trunk/JavaScriptCore/runtime/Structure.cpp

@@ -29 +29 @@
 #include "Identifier.h"
 #include "JSObject.h"
-#include "JSPropertyNameIterator.h"
-#include "Lookup.h"
 #include "PropertyNameArray.h"
 #include "StructureChain.h"
+#include "Lookup.h"
 #include <wtf/RefCountedLeakCounter.h>
 #include <wtf/RefPtr.h>
@@ -161 +160 @@
 
     }
-    
-    if (m_enumerationCache)
-        m_enumerationCache->setCachedStructure(0);
+
+    if (m_cachedPropertyNameArrayData)
+        m_cachedPropertyNameArrayData->setCachedStructure(0);
 
     if (m_propertyTable) {
@@ -282 +281 @@
         insertIntoPropertyMapHashTable(entry);
     }
+}
+
+void Structure::clearEnumerationCache()
+{
+    if (m_cachedPropertyNameArrayData)
+        m_cachedPropertyNameArrayData->setCachedStructure(0);
+    m_cachedPropertyNameArrayData.clear();
 }
 
@@ -547 +553 @@
 size_t Structure::addPropertyWithoutTransition(const Identifier& propertyName, unsigned attributes, JSCell* specificValue)
 {
-    ASSERT(!m_enumerationCache);
     materializePropertyMapIfNecessary();
 
@@ -554 +559 @@
     if (propertyStorageSize() > propertyStorageCapacity())
         growPropertyStorageCapacity();
+    clearEnumerationCache();
     return offset;
 }
@@ -560 +566 @@
 {
     ASSERT(isUncacheableDictionary());
-    ASSERT(!m_enumerationCache);
 
     materializePropertyMapIfNecessary();
@@ -566 +571 @@
     m_isPinnedPropertyTable = true;
     size_t offset = remove(propertyName);
+    clearEnumerationCache();
     return offset;
 }