JavaScriptCore-7600.1.4.9.tar.gz

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

diff --git a/runtime/PropertyNameArray.cpp b/runtime/PropertyNameArray.cpp
index 8efb4065e1739cf05d5d9166c75becd80dde30fc..a8f64ea6582d0a89e1cb2963f17220f80b4ffafc 100644 (file)
--- a/runtime/PropertyNameArray.cpp
+++ b/runtime/PropertyNameArray.cpp
@@ -21,8 +21,8 @@
 #include "config.h"
 #include "PropertyNameArray.h"
 
+#include "JSCInlines.h"
 #include "JSObject.h"
-#include "ScopeChain.h"
 #include "Structure.h"
 #include "StructureChain.h"
 
@@ -32,7 +32,7 @@ static const size_t setThreshold = 20;
 
 void PropertyNameArray::add(StringImpl* identifier)
 {
-    ASSERT(!identifier || identifier == StringImpl::empty() || identifier->isIdentifier());
+    ASSERT(!identifier || identifier == StringImpl::empty() || identifier->isAtomic());
 
     size_t size = m_data->propertyNameVector().size();
     if (size < setThreshold) {
@@ -45,7 +45,7 @@ void PropertyNameArray::add(StringImpl* identifier)
             for (size_t i = 0; i < size; ++i)
                 m_set.add(m_data->propertyNameVector()[i].impl());
         }
-        if (!m_set.add(identifier).second)
+        if (!m_set.add(identifier).isNewEntry)
             return;
     }