JavaScriptCore-7600.1.4.11.8.tar.gz

[apple/javascriptcore.git] / runtime / PropertyNameArray.cpp

diff --git a/runtime/PropertyNameArray.cpp b/runtime/PropertyNameArray.cpp
index 0878e73f879da6b0923227fbc5d488d922bcdff5..a8f64ea6582d0a89e1cb2963f17220f80b4ffafc 100644 (file)
--- a/runtime/PropertyNameArray.cpp
+++ b/runtime/PropertyNameArray.cpp
@@ -21,30 +21,35 @@
 #include "config.h"
 #include "PropertyNameArray.h"
 
 #include "config.h"
 #include "PropertyNameArray.h"
 

+#include "JSCInlines.h"
+#include "JSObject.h"
+#include "Structure.h"
+#include "StructureChain.h"
+

 namespace JSC {
 
 static const size_t setThreshold = 20;
 
 namespace JSC {
 
 static const size_t setThreshold = 20;
 

-void PropertyNameArray::add(UString::Rep* identifier)
+void PropertyNameArray::add(StringImpl* identifier)

 {
 {

-    ASSERT(identifier == &UString::Rep::null() || identifier == &UString::Rep::empty() || identifier->identifierTable());
+    ASSERT(!identifier || identifier == StringImpl::empty() || identifier->isAtomic());

 
     size_t size = m_data->propertyNameVector().size();
     if (size < setThreshold) {
         for (size_t i = 0; i < size; ++i) {
 
     size_t size = m_data->propertyNameVector().size();
     if (size < setThreshold) {
         for (size_t i = 0; i < size; ++i) {

-            if (identifier == m_data->propertyNameVector()[i].ustring().rep())
+            if (identifier == m_data->propertyNameVector()[i].impl())

                 return;
         }
     } else {
         if (m_set.isEmpty()) {
             for (size_t i = 0; i < size; ++i)
                 return;
         }
     } else {
         if (m_set.isEmpty()) {
             for (size_t i = 0; i < size; ++i)

-                m_set.add(m_data->propertyNameVector()[i].ustring().rep());
+                m_set.add(m_data->propertyNameVector()[i].impl());

         }
         }

-        if (!m_set.add(identifier).second)
+        if (!m_set.add(identifier).isNewEntry)

             return;
     }
 
             return;
     }
 

-    m_data->propertyNameVector().append(Identifier(m_globalData, identifier));
+    addKnownUnique(identifier);

 }
 
 } // namespace JSC
 }
 
 } // namespace JSC