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

Timestamp:

Oct 30, 2009, 12:13:38 AM (16 years ago)

Author:

[email protected]

Message:

REGRESSION (r50218-r50262): E*TRADE accounts page is missing content
​https://bugs.webkit.org/show_bug.cgi?id=30947
<rdar://problem/7348833>

Reviewed by Maciej Stachowiak

The logic for flagging that a structure has non-enumerable properties
was in addPropertyWithoutTransition, rather than in the core Structure::put
method. Despite this I was unable to produce a testcase that caused
the failure that etrade was experiencing, but the new assertion in
getEnumerablePropertyNames triggers on numerous layout tests without
the fix, so in effecti all for..in enumeration in any test ends up
doing the required consistency check.

File:

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

trunk/JavaScriptCore/runtime/Structure.cpp

@@ -557 +557 @@
 
     m_isPinnedPropertyTable = true;
-    if (attributes & DontEnum)
-        m_hasNonEnumerableProperties = true;
 
     size_t offset = put(propertyName, attributes, specificValue);
@@ -739 +737 @@
 
     checkConsistency();
+
+    if (attributes & DontEnum)
+        m_hasNonEnumerableProperties = true;
 
     UString::Rep* rep = propertyName._ustring.rep();
@@ -1026 +1027 @@
         unsigned entryCount = m_propertyTable->keyCount + m_propertyTable->deletedSentinelCount;
         for (unsigned k = 1; k <= entryCount; k++) {
+            ASSERT(m_hasNonEnumerableProperties || !(m_propertyTable->entries()[k].attributes & DontEnum));
             if (m_propertyTable->entries()[k].key && !(m_propertyTable->entries()[k].attributes & DontEnum)) {
                 PropertyMapEntry* value = &m_propertyTable->entries()[k];
@@ -1113 +1115 @@
     unsigned nonEmptyEntryCount = 0;
     for (unsigned c = 1; c <= m_propertyTable->keyCount + m_propertyTable->deletedSentinelCount; ++c) {
+        ASSERT(m_hasNonEnumerableProperties || !(m_propertyTable->entries()[c].attributes & DontEnum));
         UString::Rep* rep = m_propertyTable->entries()[c].key;
         if (!rep)