JavaScriptCore-7600.1.4.15.12.tar.gz

[apple/javascriptcore.git] / heap / Strong.h

diff --git a/heap/Strong.h b/heap/Strong.h
index 9f2aa05e25e0a9a5f738cac8307d56ba8a7eb26a..27ab5d31f997b208846da9644351d2bd32e038cc 100644 (file)
--- a/heap/Strong.h
+++ b/heap/Strong.h
@@ -26,19 +26,19 @@
 #ifndef Strong_h
 #define Strong_h
 
 #ifndef Strong_h
 #define Strong_h
 

-#include "Assertions.h"
+#include <wtf/Assertions.h>

 #include "Handle.h"
 #include "Handle.h"

-#include "HandleHeap.h"
+#include "HandleSet.h"

 
 namespace JSC {
 
 
 namespace JSC {
 

-class JSGlobalData;
-HandleSlot allocateGlobalHandle(JSGlobalData&);
+class VM;

 
 // A strongly referenced handle that prevents the object it points to from being garbage collected.
 template <typename T> class Strong : public Handle<T> {
     using Handle<T>::slot;
     using Handle<T>::setSlot;
 
 // A strongly referenced handle that prevents the object it points to from being garbage collected.
 template <typename T> class Strong : public Handle<T> {
     using Handle<T>::slot;
     using Handle<T>::setSlot;

+    template <typename U> friend class Strong;

 
 public:
     typedef typename Handle<T>::ExternalType ExternalType;
 
 public:
     typedef typename Handle<T>::ExternalType ExternalType;


@@ -48,24 +48,16 @@ public:
     {
     }
     
     {
     }
     

-    Strong(JSGlobalData& globalData, ExternalType value = ExternalType())
-        : Handle<T>(allocateGlobalHandle(globalData))
-    {
-        set(value);
-    }
+    Strong(VM&, ExternalType = ExternalType());

 
 

-    Strong(JSGlobalData& globalData, Handle<T> handle)
-        : Handle<T>(allocateGlobalHandle(globalData))
-    {
-        set(handle.get());
-    }
+    Strong(VM&, Handle<T>);

     
     Strong(const Strong& other)
         : Handle<T>()
     {
         if (!other.slot())
             return;
     
     Strong(const Strong& other)
         : Handle<T>()
     {
         if (!other.slot())
             return;

-        setSlot(HandleHeap::heapFor(other.slot())->allocate());
+        setSlot(HandleSet::heapFor(other.slot())->allocate());

         set(other.get());
     }
 
         set(other.get());
     }
 


@@ -74,7 +66,7 @@ public:
     {
         if (!other.slot())
             return;
     {
         if (!other.slot())
             return;

-        setSlot(HandleHeap::heapFor(other.slot())->allocate());
+        setSlot(HandleSet::heapFor(other.slot())->allocate());

         set(other.get());
     }
     
         set(other.get());
     }
     


@@ -90,17 +82,20 @@ public:
         clear();
     }
 
         clear();
     }
 

+    bool operator!() const { return !slot() || !*slot(); }
+
+    // This conversion operator allows implicit conversion to bool but not to other integer types.
+    typedef JSValue (HandleBase::*UnspecifiedBoolType);
+    operator UnspecifiedBoolType*() const { return !!*this ? reinterpret_cast<UnspecifiedBoolType*>(1) : 0; }
+

     void swap(Strong& other)
     {
         Handle<T>::swap(other);
     }
 
     void swap(Strong& other)
     {
         Handle<T>::swap(other);
     }
 

-    void set(JSGlobalData& globalData, ExternalType value)
-    {
-        if (!slot())
-            setSlot(allocateGlobalHandle(globalData));
-        set(value);
-    }
+    ExternalType get() const { return HandleTypes<T>::getFromSlot(this->slot()); }
+
+    void set(VM&, ExternalType);

 
     template <typename U> Strong& operator=(const Strong<U>& other)
     {
 
     template <typename U> Strong& operator=(const Strong<U>& other)
     {


@@ -109,7 +104,7 @@ public:
             return *this;
         }
 
             return *this;
         }
 

-        set(*HandleHeap::heapFor(other.slot())->globalData(), other.get());
+        set(*HandleSet::heapFor(other.slot())->vm(), other.get());

         return *this;
     }
     
         return *this;
     }
     


@@ -120,7 +115,7 @@ public:
             return *this;
         }
 
             return *this;
         }
 

-        set(*HandleHeap::heapFor(other.slot())->globalData(), other.get());
+        set(*HandleSet::heapFor(other.slot())->vm(), other.get());

         return *this;
     }
 
         return *this;
     }
 


@@ -128,7 +123,7 @@ public:
     {
         if (!slot())
             return;
     {
         if (!slot())
             return;

-        HandleHeap::heapFor(slot())->deallocate(slot());
+        HandleSet::heapFor(slot())->deallocate(slot());

         setSlot(0);
     }
 
         setSlot(0);
     }
 


@@ -139,7 +134,7 @@ private:
     {
         ASSERT(slot());
         JSValue value = HandleTypes<T>::toJSValue(externalType);
     {
         ASSERT(slot());
         JSValue value = HandleTypes<T>::toJSValue(externalType);

-        HandleHeap::heapFor(slot())->writeBarrier(slot(), value);
+        HandleSet::heapFor(slot())->writeBarrier(slot(), value);

         *slot() = value;
     }
 };
         *slot() = value;
     }
 };


@@ -153,11 +148,11 @@ template<class T> inline void swap(Strong<T>& a, Strong<T>& b)
 
 namespace WTF {
 
 
 namespace WTF {
 

-template<typename T> struct VectorTraits<JSC::Strong<T> > : SimpleClassVectorTraits {
+template<typename T> struct VectorTraits<JSC::Strong<T>> : SimpleClassVectorTraits {

     static const bool canCompareWithMemcmp = false;
 };
 
     static const bool canCompareWithMemcmp = false;
 };
 

-template<typename P> struct HashTraits<JSC::Strong<P> > : SimpleClassHashTraits<JSC::Strong<P> > { };
+template<typename P> struct HashTraits<JSC::Strong<P>> : SimpleClassHashTraits<JSC::Strong<P>> { };

 
 }
 
 
 }