JavaScriptCore-7600.1.4.11.8.tar.gz

[apple/javascriptcore.git] / runtime / JSPropertyNameIterator.h

diff --git a/runtime/JSPropertyNameIterator.h b/runtime/JSPropertyNameIterator.h
index 5b65e59f25c7222f541d8bdf6a960ab50430f057..d48185eca20b85f1a2c2553628f13d4bfa8996b6 100644 (file)
--- a/runtime/JSPropertyNameIterator.h
+++ b/runtime/JSPropertyNameIterator.h
@@ -10,7 +10,7 @@
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.

- * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ * 3.  Neither the name of Apple Inc. ("Apple") nor the names of

  *     its contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
  *     its contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *


@@ -31,8 +31,8 @@
 
 #include "JSObject.h"
 #include "JSString.h"
 
 #include "JSObject.h"
 #include "JSString.h"

-#include "Operations.h"

 #include "PropertyNameArray.h"
 #include "PropertyNameArray.h"

+#include <memory>

 
 namespace JSC {
 
 
 namespace JSC {
 


@@ -47,53 +47,44 @@ namespace JSC {
         typedef JSCell Base;
 
         static JSPropertyNameIterator* create(ExecState*, JSObject*);
         typedef JSCell Base;
 
         static JSPropertyNameIterator* create(ExecState*, JSObject*);

-        static JSPropertyNameIterator* create(ExecState* exec, PropertyNameArrayData* propertyNameArrayData, size_t numCacheableSlot)
-        {
-            JSPropertyNameIterator* iterator = new (NotNull, allocateCell<JSPropertyNameIterator>(*exec->heap())) JSPropertyNameIterator(exec, propertyNameArrayData, numCacheableSlot);
-            iterator->finishCreation(exec, propertyNameArrayData);
-            return iterator;
-        }

 
 

+        static const bool needsDestruction = true;
+        static const bool hasImmortalStructure = true;

         static void destroy(JSCell*);
        
         static void destroy(JSCell*);
        

-        static Structure* createStructure(JSGlobalData& globalData, JSGlobalObject* globalObject, JSValue prototype)
+        static Structure* createStructure(VM& vm, JSGlobalObject* globalObject, JSValue prototype)

         {
         {

-            return Structure::create(globalData, globalObject, prototype, TypeInfo(CompoundType, OverridesVisitChildren), &s_info);
+            return Structure::create(vm, globalObject, prototype, TypeInfo(CompoundType, StructureFlags), info());

         }
 
         static void visitChildren(JSCell*, SlotVisitor&);
 
         }
 
         static void visitChildren(JSCell*, SlotVisitor&);
 

-        bool getOffset(size_t i, int& offset)
-        {
-            if (i >= m_numCacheableSlots)
-                return false;
-            offset = i;
-            return true;
-        }
-

         JSValue get(ExecState*, JSObject*, size_t i);
         size_t size() { return m_jsStringsSize; }
 
         JSValue get(ExecState*, JSObject*, size_t i);
         size_t size() { return m_jsStringsSize; }
 

-        void setCachedStructure(JSGlobalData& globalData, Structure* structure)
+        void setCachedStructure(VM& vm, Structure* structure)

         {
             ASSERT(!m_cachedStructure);
             ASSERT(structure);
         {
             ASSERT(!m_cachedStructure);
             ASSERT(structure);

-            m_cachedStructure.set(globalData, this, structure);
+            m_cachedStructure.set(vm, this, structure);

         }
         Structure* cachedStructure() { return m_cachedStructure.get(); }
 
         }
         Structure* cachedStructure() { return m_cachedStructure.get(); }
 

-        void setCachedPrototypeChain(JSGlobalData& globalData, StructureChain* cachedPrototypeChain) { m_cachedPrototypeChain.set(globalData, this, cachedPrototypeChain); }
+        void setCachedPrototypeChain(VM& vm, StructureChain* cachedPrototypeChain) { m_cachedPrototypeChain.set(vm, this, cachedPrototypeChain); }

         StructureChain* cachedPrototypeChain() { return m_cachedPrototypeChain.get(); }
         
         StructureChain* cachedPrototypeChain() { return m_cachedPrototypeChain.get(); }
         

-        static const ClassInfo s_info;
+        DECLARE_EXPORT_INFO;

 
     protected:
 
     protected:

-        void finishCreation(ExecState* exec, PropertyNameArrayData* propertyNameArrayData)
+        static const unsigned StructureFlags = OverridesVisitChildren | StructureIsImmortal;
+
+        void finishCreation(VM& vm, PropertyNameArrayData* propertyNameArrayData, JSObject* object)

         {
         {

-            Base::finishCreation(exec->globalData());
+            Base::finishCreation(vm);

             PropertyNameArrayData::PropertyNameVector& propertyNameVector = propertyNameArrayData->propertyNameVector();
             for (size_t i = 0; i < m_jsStringsSize; ++i)
             PropertyNameArrayData::PropertyNameVector& propertyNameVector = propertyNameArrayData->propertyNameVector();
             for (size_t i = 0; i < m_jsStringsSize; ++i)

-                m_jsStrings[i].set(exec->globalData(), this, jsOwnedString(exec, propertyNameVector[i].ustring()));
+                m_jsStrings[i].set(vm, this, jsOwnedString(&vm, propertyNameVector[i].string()));
+            m_cachedStructureInlineCapacity = object->structure()->inlineCapacity();

         }
 
     private:
         }
 
     private:


@@ -105,23 +96,23 @@ namespace JSC {
         WriteBarrier<StructureChain> m_cachedPrototypeChain;
         uint32_t m_numCacheableSlots;
         uint32_t m_jsStringsSize;
         WriteBarrier<StructureChain> m_cachedPrototypeChain;
         uint32_t m_numCacheableSlots;
         uint32_t m_jsStringsSize;

-        OwnArrayPtr<WriteBarrier<Unknown> > m_jsStrings;
+        unsigned m_cachedStructureInlineCapacity;
+        std::unique_ptr<WriteBarrier<Unknown>[]> m_jsStrings;

     };
 
     };
 

-    inline void Structure::setEnumerationCache(JSGlobalData& globalData, JSPropertyNameIterator* enumerationCache)
+    ALWAYS_INLINE JSPropertyNameIterator* Register::propertyNameIterator() const

     {
     {

-        ASSERT(!isDictionary());
-        m_enumerationCache.set(globalData, this, enumerationCache);
+        return jsCast<JSPropertyNameIterator*>(jsValue().asCell());

     }
 
     }
 

-    inline JSPropertyNameIterator* Structure::enumerationCache()
+    inline JSPropertyNameIterator* StructureRareData::enumerationCache()

     {
         return m_enumerationCache.get();
     }
     {
         return m_enumerationCache.get();
     }

-
-    ALWAYS_INLINE JSPropertyNameIterator* Register::propertyNameIterator() const
+    
+    inline void StructureRareData::setEnumerationCache(VM& vm, JSPropertyNameIterator* value)

     {
     {

-        return jsCast<JSPropertyNameIterator*>(jsValue().asCell());
+        m_enumerationCache.set(vm, this, value);

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