JavaScriptCore-7601.1.46.3.tar.gz

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

diff --git a/runtime/StructureRareData.h b/runtime/StructureRareData.h
index 1808b6a1c2f94a77c7dd572e6bf41f00a07e4f06..2b11ab8338ee5232f2c144a36836c1a594d915ce 100644 (file)
--- a/runtime/StructureRareData.h
+++ b/runtime/StructureRareData.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (C) 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.

  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions


@@ -29,25 +29,27 @@
 #include "ClassInfo.h"
 #include "JSCell.h"
 #include "JSTypeInfo.h"
 #include "ClassInfo.h"
 #include "JSCell.h"
 #include "JSTypeInfo.h"

+#include "PropertyOffset.h"

 
 namespace JSC {
 
 
 namespace JSC {
 

-class JSPropertyNameIterator;
+class JSPropertyNameEnumerator;

 class Structure;
 
 class Structure;
 

-class StructureRareData : public JSCell {
-    friend class Structure;
+class StructureRareData final : public JSCell {

 public:
 public:

+    typedef JSCell Base;
+    static const unsigned StructureFlags = Base::StructureFlags | StructureIsImmortal;
+

     static StructureRareData* create(VM&, Structure*);
     static StructureRareData* create(VM&, Structure*);

-    static StructureRareData* clone(VM&, const StructureRareData* other);
+
+    static const bool needsDestruction = true;
+    static void destroy(JSCell*);

 
     static void visitChildren(JSCell*, SlotVisitor&);
 
     static Structure* createStructure(VM&, JSGlobalObject*, JSValue prototype);
 
 
     static void visitChildren(JSCell*, SlotVisitor&);
 
     static Structure* createStructure(VM&, JSGlobalObject*, JSValue prototype);
 

-    // Returns true if this StructureRareData should also be cloned when cloning the owner Structure.
-    bool needsCloning() const { return false; }
-

     Structure* previousID() const;
     void setPreviousID(VM&, Structure*);
     void clearPreviousID();
     Structure* previousID() const;
     void setPreviousID(VM&, Structure*);
     void clearPreviousID();


@@ -55,20 +57,23 @@ public:
     JSString* objectToStringValue() const;
     void setObjectToStringValue(VM&, JSString* value);
 
     JSString* objectToStringValue() const;
     void setObjectToStringValue(VM&, JSString* value);
 

-    JSPropertyNameIterator* enumerationCache();
-    void setEnumerationCache(VM&, JSPropertyNameIterator* value);
+    JSPropertyNameEnumerator* cachedPropertyNameEnumerator() const;
+    void setCachedPropertyNameEnumerator(VM&, JSPropertyNameEnumerator*);

 
     DECLARE_EXPORT_INFO;
 
 private:
 
     DECLARE_EXPORT_INFO;
 
 private:

+    friend class Structure;
+    

     StructureRareData(VM&, Structure*);
     StructureRareData(VM&, Structure*);

-    StructureRareData(VM&, const StructureRareData*);
-
-    static const unsigned StructureFlags = OverridesVisitChildren | JSCell::StructureFlags;

 
     WriteBarrier<Structure> m_previous;
     WriteBarrier<JSString> m_objectToStringValue;
 
     WriteBarrier<Structure> m_previous;
     WriteBarrier<JSString> m_objectToStringValue;

-    WriteBarrier<JSPropertyNameIterator> m_enumerationCache;
+    WriteBarrier<JSPropertyNameEnumerator> m_cachedPropertyNameEnumerator;
+    WriteBarrier<JSPropertyNameEnumerator> m_cachedGenericPropertyNameEnumerator;
+    
+    typedef HashMap<PropertyOffset, RefPtr<WatchpointSet>, WTF::IntHash<PropertyOffset>, WTF::UnsignedWithZeroKeyHashTraits<PropertyOffset>> PropertyWatchpointMap;
+    std::unique_ptr<PropertyWatchpointMap> m_replacementWatchpointSets;

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