Changeset 79948 in webkit

Timestamp:

Feb 28, 2011 5:06:21 PM (13 years ago)

Author:

oliver@apple.com

Message:

2011-02-28 Oliver Hunt <​oliver@apple.com>

Reviewed by Darin Adler.

Stop using DeprecatedPtr for the global exception slot
​https://bugs.webkit.org/show_bug.cgi?id=55424

Create GCRootPtr to signify that the exception slot is
a gcroot, and so is exempt from the usual writebarrier
restrictions.

• runtime/JSGlobalData.h:
• runtime/WriteBarrier.h: (JSC::GCRootPtr::GCRootPtr): (JSC::GCRootPtr::operator=):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• runtime/JSGlobalData.h (modified) (1 diff)
• runtime/WriteBarrier.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-02-28  Oliver Hunt  <oliver@apple.com>
+
+        Reviewed by Darin Adler.
+
+        Stop using DeprecatedPtr for the global exception slot
+        https://bugs.webkit.org/show_bug.cgi?id=55424
+
+        Create GCRootPtr to signify that the exception slot is
+        a gcroot, and so is exempt from the usual writebarrier
+        restrictions.
+
+        * runtime/JSGlobalData.h:
+        * runtime/WriteBarrier.h:
+        (JSC::GCRootPtr::GCRootPtr):
+        (JSC::GCRootPtr::operator=):
+
 2011-02-28  Adam Barth  <abarth@webkit.org>
 

trunk/Source/JavaScriptCore/runtime/JSGlobalData.h

@@ -207 +207 @@
         Heap heap;
 
-        DeprecatedPtr<Unknown> exception;
+        GCRootPtr<Unknown> exception;
 #if ENABLE(JIT)
         ReturnAddressPtr exceptionLocation;

trunk/Source/JavaScriptCore/runtime/WriteBarrier.h

@@ -152 +152 @@
 };
 
+template <typename T> class GCRootPtr : public WriteBarrierBase<T> {
+public:
+    GCRootPtr() { }
+    GCRootPtr(T* value)
+    {
+        this->setWithoutWriteBarrier(value);
+    }
+
+    GCRootPtr& operator=(T* value)
+    {
+        this->setWithoutWriteBarrier(value);
+        return *this;
+    }
+
+private:
+    using WriteBarrier<T>::set;
+    using WriteBarrier<T>::setWithoutWriteBarrier;
+};
+
+template <> class GCRootPtr<Unknown> : public WriteBarrierBase<Unknown> {
+public:
+    GCRootPtr() { }
+    GCRootPtr(JSValue value)
+    {
+        this->setWithoutWriteBarrier(value);
+    }
+    
+    GCRootPtr& operator=(JSValue value)
+    {
+        this->setWithoutWriteBarrier(value);
+        return *this;
+    }
+    
+private:
+    using WriteBarrierBase<Unknown>::set;
+    using WriteBarrierBase<Unknown>::setWithoutWriteBarrier;
+};
+    
 template <typename U, typename V> inline bool operator==(const DeprecatedPtr<U>& lhs, const DeprecatedPtr<V>& rhs)
 {