Changeset 181248 in webkit

Timestamp:

Mar 8, 2015 4:47:25 PM (9 years ago)

Author:

akling@apple.com

Message:

BuiltinExecutables keeps finalized Weaks around, pinning WeakBlocks.
<​https://webkit.org/b/142460>

Reviewed by Geoffrey Garen.

Make BuiltinExecutables a WeakHandleOwner so it can clear out its respective Weak members
if and when their pointees get garbage collected.

This fixes an issue I've seen locally where a WeakBlock is pinned down by a single one of
these Weak<BuiltinExecutables>.

• builtins/BuiltinExecutables.h: Make BuiltinExecutables inherit from WeakHandleOwner.

• builtins/BuiltinExecutables.cpp:

(JSC::BuiltinExecutables::finalize): Clear out the relevant member pointer when it's been
garbage collected. We use the WeakImpl's "context" field to pass the address of the member.

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• builtins/BuiltinExecutables.cpp (modified) (1 diff)
• builtins/BuiltinExecutables.h (modified) (3 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2015-03-08  Andreas Kling  <akling@apple.com>
+
+        BuiltinExecutables keeps finalized Weaks around, pinning WeakBlocks.
+        <https://webkit.org/b/142460>
+
+        Reviewed by Geoffrey Garen.
+
+        Make BuiltinExecutables a WeakHandleOwner so it can clear out its respective Weak members
+        if and when their pointees get garbage collected.
+
+        This fixes an issue I've seen locally where a WeakBlock is pinned down by a single one of
+        these Weak<BuiltinExecutables>.
+
+        * builtins/BuiltinExecutables.h: Make BuiltinExecutables inherit from WeakHandleOwner.
+
+        * builtins/BuiltinExecutables.cpp:
+        (JSC::BuiltinExecutables::finalize): Clear out the relevant member pointer when it's been
+        garbage collected. We use the WeakImpl's "context" field to pass the address of the member.
+
 2015-03-07  Geoffrey Garen  <ggaren@apple.com>
 

trunk/Source/JavaScriptCore/builtins/BuiltinExecutables.cpp

@@ -84 +84 @@
 }
 
+void BuiltinExecutables::finalize(Handle<Unknown>, void* context)
+{
+    static_cast<Weak<UnlinkedFunctionExecutable>*>(context)->clear();
+}
+
 #define DEFINE_BUILTIN_EXECUTABLES(name, functionName, length) \
 UnlinkedFunctionExecutable* BuiltinExecutables::name##Executable() \
 {\
     if (!m_##name##Executable)\
-        m_##name##Executable = createBuiltinExecutable(m_##name##Source, m_vm.propertyNames->builtinNames().functionName##PublicName());\
+        m_##name##Executable = Weak<UnlinkedFunctionExecutable>(createBuiltinExecutable(m_##name##Source, m_vm.propertyNames->builtinNames().functionName##PublicName()), this, &m_##name##Executable);\
     return m_##name##Executable.get();\
 }

trunk/Source/JavaScriptCore/builtins/BuiltinExecutables.h

@@ -30 +30 @@
 #include "SourceCode.h"
 #include "Weak.h"
+#include "WeakHandleOwner.h"
 
 namespace JSC {
@@ -37 +38 @@
 class VM;
 
-class BuiltinExecutables {
+class BuiltinExecutables final: private WeakHandleOwner {
     WTF_MAKE_FAST_ALLOCATED;
 public:
@@ -50 +51 @@
     
 private:
+    void finalize(Handle<Unknown>, void* context) override;
+
     VM& m_vm;
     UnlinkedFunctionExecutable* createBuiltinExecutable(const SourceCode&, const Identifier&);