Changeset 226725 in webkit for trunk/Source/JavaScriptCore/heap/CodeBlockSet.h

Timestamp:

Jan 10, 2018, 11:41:12 AM (8 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r226667 and r226673.
​https://bugs.webkit.org/show_bug.cgi?id=181488

This caused a flaky crash. (Requested by mlewis13 on #webkit).

Reverted changesets:

"CodeBlocks should be in IsoSubspaces"
​https://bugs.webkit.org/show_bug.cgi?id=180884
​https://trac.webkit.org/changeset/226667

"REGRESSION (r226667): CodeBlocks should be in IsoSubspaces"
​https://bugs.webkit.org/show_bug.cgi?id=180884
​https://trac.webkit.org/changeset/226673

File:

• trunk/Source/JavaScriptCore/heap/CodeBlockSet.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/heap/CodeBlockSet.h

@@ -50 +50 @@
     ~CodeBlockSet();
 
+    void lastChanceToFinalize(VM&);
+    
+    // Add a CodeBlock. This is only called by CodeBlock constructors.
+    void add(CodeBlock*);
+    
+    // Clear all mark bits for all CodeBlocks.
+    void clearMarksForFullCollection();
+
+    // Mark a pointer that may be a CodeBlock that belongs to the set of DFG
+    // blocks. This is defined in CodeBlock.h.
+private:
     void mark(const AbstractLocker&, CodeBlock* candidateCodeBlock);
+public:
+    void mark(const AbstractLocker&, void* candidateCodeBlock);
+    
+    // Delete all code blocks that are only referenced by this set (i.e. owned
+    // by this set), and that have not been marked.
+    void deleteUnmarkedAndUnreferenced(VM&, CollectionScope);
     
     void clearCurrentlyExecuting();
@@ -62 +79 @@
     template<typename Functor> void iterate(const Functor&);
     template<typename Functor> void iterate(const AbstractLocker&, const Functor&);
-
-    template<typename Functor> void iterateViaSubspaces(VM&, const Functor&);
     
     template<typename Functor> void iterateCurrentlyExecuting(const Functor&);
     
     void dump(PrintStream&) const;
-    
-    void add(CodeBlock*);
-    void remove(CodeBlock*);
 
 private:
-    HashSet<CodeBlock*> m_codeBlocks;
+    void promoteYoungCodeBlocks(const AbstractLocker&);
+
+    HashSet<CodeBlock*> m_oldCodeBlocks;
+    HashSet<CodeBlock*> m_newCodeBlocks;
     HashSet<CodeBlock*> m_currentlyExecuting;
     Lock m_lock;