Changeset 190113 in webkit for trunk/Source/JavaScriptCore/heap/WeakImpl.h

Timestamp:

Sep 22, 2015, 5:21:31 AM (10 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r189616.
​https://bugs.webkit.org/show_bug.cgi?id=149456

suspected cause of multiple regressions (Requested by kling on
#webkit).

Reverted changeset:

"[JSC] Weak should only accept cell pointees."
​https://bugs.webkit.org/show_bug.cgi?id=148955
​http://trac.webkit.org/changeset/189616

File:

• trunk/Source/JavaScriptCore/heap/WeakImpl.h (modified) (4 diffs)

trunk/Source/JavaScriptCore/heap/WeakImpl.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2012-2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2012 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -47 +47 @@
 
     WeakImpl();
-    WeakImpl(JSCell&, WeakHandleOwner*, void* context);
+    WeakImpl(JSValue, WeakHandleOwner*, void* context);
 
-    State state() const;
+    State state();
     void setState(State);
 
-    JSCell* cell();
+    const JSValue& jsValue();
     WeakHandleOwner* weakHandleOwner();
     void* context();
 
-    static WeakImpl* asWeakImpl(JSCell**);
+    static WeakImpl* asWeakImpl(JSValue*);
 
 private:
-    friend class WeakBlock;
-
-    JSCell* m_cell { nullptr };
-    WeakHandleOwner* m_weakHandleOwner { nullptr };
-    void* m_context { nullptr };
+    const JSValue m_jsValue;
+    WeakHandleOwner* m_weakHandleOwner;
+    void* m_context;
 };
 
 inline WeakImpl::WeakImpl()
+    : m_weakHandleOwner(0)
+    , m_context(0)
 {
     setState(Deallocated);
 }
 
-inline WeakImpl::WeakImpl(JSCell& cell, WeakHandleOwner* weakHandleOwner, void* context)
-    : m_cell(&cell)
+inline WeakImpl::WeakImpl(JSValue jsValue, WeakHandleOwner* weakHandleOwner, void* context)
+    : m_jsValue(jsValue)
     , m_weakHandleOwner(weakHandleOwner)
     , m_context(context)
 {
     ASSERT(state() == Live);
+    ASSERT(m_jsValue && m_jsValue.isCell());
 }
 
-inline WeakImpl::State WeakImpl::state() const
+inline WeakImpl::State WeakImpl::state()
 {
     return static_cast<State>(reinterpret_cast<uintptr_t>(m_weakHandleOwner) & StateMask);
@@ -90 +91 @@
 }
 
-inline JSCell* WeakImpl::cell()
+inline const JSValue& WeakImpl::jsValue()
 {
-    return m_cell;
+    return m_jsValue;
 }
 
@@ -105 +106 @@
 }
 
-inline WeakImpl* WeakImpl::asWeakImpl(JSCell** slot)
+inline WeakImpl* WeakImpl::asWeakImpl(JSValue* slot)
 {
-    return reinterpret_cast_ptr<WeakImpl*>(reinterpret_cast_ptr<char*>(slot));
+    return reinterpret_cast_ptr<WeakImpl*>(reinterpret_cast_ptr<char*>(slot) + OBJECT_OFFSETOF(WeakImpl, m_jsValue));
 }