@@ -207,6 +207,6 @@ JSObject* OpaqueJSClass::prototype(ExecState* exec)
             prototype->setPrototype(exec->vm(), parentPrototype);
     }
 
-    jsClassData.cachedPrototype = PassWeak<JSObject>(prototype);
+    jsClassData.cachedPrototype = Weak<JSObject>(prototype);
     return prototype;
 }
@@ -1,3 +1,21 @@
+2013-09-26  Anders Carlsson  <andersca@apple.com>
+
+        Weak should have a move constructor and move assignment operator
+        https://bugs.webkit.org/show_bug.cgi?id=121963
+
+        Reviewed by Oliver Hunt.
+
+        This is the first step towards getting rid of PassWeak.
+
+        * API/JSClassRef.cpp:
+        (OpaqueJSClass::prototype):
+        * heap/Weak.h:
+        * heap/WeakInlines.h:
+        (JSC::::Weak):
+        (JSC::::leakImpl):
+        * runtime/SimpleTypedArrayController.cpp:
+        (JSC::SimpleTypedArrayController::toJS):
+
 2013-09-26  Mark Hahnenberg  <mhahnenberg@apple.com>
 
         op_to_this shouldn't use value profiling
 
@@ -57,6 +57,7 @@ template<typename T> class Weak {
     bool isHashTableDeletedValue() const;
     Weak(HashTableDeletedValueTag);
 
+    Weak(Weak&&);
     template<typename U> Weak(const PassWeak<U>&);
 
     ~Weak()
@@ -65,6 +66,8 @@ template<typename T> class Weak {
     }
 
     void swap(Weak&);
+
+    Weak& operator=(Weak&&);
     Weak& operator=(const PassWeak<T>&);
 
     bool operator!() const;
@@ -79,6 +82,7 @@ template<typename T> class Weak {
     operator UnspecifiedBoolType*() const;
 
     PassWeak<T> release();
+    WeakImpl* leakImpl() WARN_UNUSED_RETURN;
     void clear()
     {
         if (!m_impl)
 
@@ -53,6 +53,11 @@ template<typename T> template<typename U>  inline Weak<T>::Weak(const PassWeak<U
 {
 }
 
+template<typename T> inline Weak<T>::Weak(Weak&& other)
+    : m_impl(other.leakImpl())
+{
+}
+
 template<class T> inline void swap(Weak<T>& a, Weak<T>& b)
 {
     a.swap(b);
@@ -70,6 +75,13 @@ template<typename T> inline Weak<T>& Weak<T>::operator=(const PassWeak<T>& o)
     return *this;
 }
 
+template<typename T> inline auto Weak<T>::operator=(Weak&& other) -> Weak&
+{
+    Weak weak = std::move(other);
+    swap(weak);
+    return *this;
+}
+
 template<typename T> inline T* Weak<T>::operator->() const
 {
     ASSERT(m_impl && m_impl->state() == WeakImpl::Live);
@@ -111,6 +123,13 @@ template<typename T> inline PassWeak<T> Weak<T>::release()
     return tmp;
 }
 
+template<typename T> inline WeakImpl* Weak<T>::leakImpl()
+{
+    WeakImpl* impl = m_impl;
+    m_impl = nullptr;
+    return impl;
+}
+
 template<typename T> inline WeakImpl* Weak<T>::hashTableDeletedValue()
 {
     return reinterpret_cast<WeakImpl*>(-1);
 
@@ -44,7 +44,7 @@ JSArrayBuffer* SimpleTypedArrayController::toJS(
 
     JSArrayBuffer* result = JSArrayBuffer::create(
         exec->vm(), globalObject->arrayBufferStructure(), native);
-    native->m_wrapper = PassWeak<JSArrayBuffer>(result);
+    native->m_wrapper = Weak<JSArrayBuffer>(result);
     return result;
 }
Original file line number	Diff line number	Diff line change
`@@ -207,6 +207,6 @@ JSObject* OpaqueJSClass::prototype(ExecState* exec)`
`207`	`207`	`prototype->setPrototype(exec->vm(), parentPrototype);`
`208`	`208`	`}`
`209`	`209`
`210`		`- jsClassData.cachedPrototype = PassWeak<JSObject>(prototype);`
	`210`	`+ jsClassData.cachedPrototype = Weak<JSObject>(prototype);`
`211`	`211`	`return prototype;`
`212`	`212`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,11 @@ template<typename T> template<typename U> inline Weak<T>::Weak(const PassWeak<U`
`53`	`53`	`{`
`54`	`54`	`}`
`55`	`55`
	`56`	`+template<typename T> inline Weak<T>::Weak(Weak&& other)`
	`57`	`+ : m_impl(other.leakImpl())`
	`58`	`+{`
	`59`	`+}`
	`60`	`+`
`56`	`61`	`template<class T> inline void swap(Weak<T>& a, Weak<T>& b)`
`57`	`62`	`{`
`58`	`63`	`a.swap(b);`
`@@ -70,6 +75,13 @@ template<typename T> inline Weak<T>& Weak<T>::operator=(const PassWeak<T>& o)`
`70`	`75`	`return *this;`
`71`	`76`	`}`
`72`	`77`
	`78`	`+template<typename T> inline auto Weak<T>::operator=(Weak&& other) -> Weak&`
	`79`	`+{`
	`80`	`+ Weak weak = std::move(other);`
	`81`	`+ swap(weak);`
	`82`	`+ return *this;`
	`83`	`+}`
	`84`	`+`
`73`	`85`	`template<typename T> inline T* Weak<T>::operator->() const`
`74`	`86`	`{`
`75`	`87`	`ASSERT(m_impl && m_impl->state() == WeakImpl::Live);`
`@@ -111,6 +123,13 @@ template<typename T> inline PassWeak<T> Weak<T>::release()`
`111`	`123`	`return tmp;`
`112`	`124`	`}`
`113`	`125`
	`126`	`+template<typename T> inline WeakImpl* Weak<T>::leakImpl()`
	`127`	`+{`
	`128`	`+ WeakImpl* impl = m_impl;`
	`129`	`+ m_impl = nullptr;`
	`130`	`+ return impl;`
	`131`	`+}`
	`132`	`+`
`114`	`133`	`template<typename T> inline WeakImpl* Weak<T>::hashTableDeletedValue()`
`115`	`134`	`{`
`116`	`135`	`return reinterpret_cast<WeakImpl*>(-1);`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ JSArrayBuffer* SimpleTypedArrayController::toJS(`
`44`	`44`
`45`	`45`	`JSArrayBuffer* result = JSArrayBuffer::create(`
`46`	`46`	`exec->vm(), globalObject->arrayBufferStructure(), native);`
`47`		`- native->m_wrapper = PassWeak<JSArrayBuffer>(result);`
	`47`	`+ native->m_wrapper = Weak<JSArrayBuffer>(result);`
`48`	`48`	`return result;`
`49`	`49`	`}`
`50`	`50`