[webkit-changes] [190705] trunk/Source/JavaScriptCore

Wed, 07 Oct 2015 20:48:38 -0700

Title: [190705] trunk/Source/_javascript_Core
Revision
190705
Author
[email protected]
Date
2015-10-07 20:48:20 -0700 (Wed, 07 Oct 2015)

Log Message

Clean up Copied classes
https://bugs.webkit.org/show_bug.cgi?id=149863

Patch by Joseph Pecoraro <[email protected]> on 2015-10-07
Reviewed by Saam Barati.

* heap/CopiedAllocator.h:
(JSC::CopiedAllocator::isValid):
* heap/CopiedBlock.h:
* heap/CopiedBlockInlines.h:
* heap/CopiedSpace.cpp:
* heap/CopiedSpace.h:
(JSC::CopiedSpace::isInCopyPhase):
(JSC::CopiedSpace::shouldDoCopyPhase):
* heap/CopiedSpaceInlines.h:
* heap/CopyToken.h:
* heap/CopyVisitor.cpp:
* heap/CopyVisitor.h:
* heap/CopyVisitorInlines.h:
* heap/CopyWorkList.h:
* heap/HandleBlock.h:
* heap/HandleSet.h:
* heap/HeapHelperPool.cpp:
* heap/HeapHelperPool.h:

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (190704 => 190705)


--- trunk/Source/_javascript_Core/ChangeLog	2015-10-08 03:12:17 UTC (rev 190704)
+++ trunk/Source/_javascript_Core/ChangeLog	2015-10-08 03:48:20 UTC (rev 190705)
@@ -1,3 +1,29 @@
+2015-10-07  Joseph Pecoraro  <[email protected]>
+
+        Clean up Copied classes
+        https://bugs.webkit.org/show_bug.cgi?id=149863
+
+        Reviewed by Saam Barati.
+
+        * heap/CopiedAllocator.h:
+        (JSC::CopiedAllocator::isValid):
+        * heap/CopiedBlock.h:
+        * heap/CopiedBlockInlines.h:
+        * heap/CopiedSpace.cpp:
+        * heap/CopiedSpace.h:
+        (JSC::CopiedSpace::isInCopyPhase):
+        (JSC::CopiedSpace::shouldDoCopyPhase):
+        * heap/CopiedSpaceInlines.h:
+        * heap/CopyToken.h:
+        * heap/CopyVisitor.cpp:
+        * heap/CopyVisitor.h:
+        * heap/CopyVisitorInlines.h:
+        * heap/CopyWorkList.h:
+        * heap/HandleBlock.h:
+        * heap/HandleSet.h:
+        * heap/HeapHelperPool.cpp:
+        * heap/HeapHelperPool.h:
+
 2015-10-07  Mark Lam  <[email protected]>
 
         [Follow up 2] Disable tail calls because it is breaking some sites.

Modified: trunk/Source/_javascript_Core/heap/CopiedAllocator.h (190704 => 190705)


--- trunk/Source/_javascript_Core/heap/CopiedAllocator.h	2015-10-08 03:12:17 UTC (rev 190704)
+++ trunk/Source/_javascript_Core/heap/CopiedAllocator.h	2015-10-08 03:48:20 UTC (rev 190705)
@@ -28,7 +28,6 @@
 
 #include "CopiedBlock.h"
 #include <wtf/CheckedBoolean.h>
-#include <wtf/DataLog.h>
 
 namespace JSC {
 
@@ -45,7 +44,7 @@
     void setCurrentBlock(CopiedBlock*);
     size_t currentCapacity();
     
-    bool isValid() { return !!m_currentBlock; }
+    bool isValid() const { return !!m_currentBlock; }
 
     CopiedBlock* currentBlock() { return m_currentBlock; }

Modified: trunk/Source/_javascript_Core/heap/CopiedBlock.h (190704 => 190705)


--- trunk/Source/_javascript_Core/heap/CopiedBlock.h	2015-10-08 03:12:17 UTC (rev 190704)
+++ trunk/Source/_javascript_Core/heap/CopiedBlock.h	2015-10-08 03:48:20 UTC (rev 190705)
@@ -29,7 +29,6 @@
 #include "CopyWorkList.h"
 #include "JSCJSValue.h"
 #include "Options.h"
-#include <wtf/Atomics.h>
 #include <wtf/DoublyLinkedList.h>
 #include <wtf/Lock.h>

Modified: trunk/Source/_javascript_Core/heap/CopiedBlockInlines.h (190704 => 190705)


--- trunk/Source/_javascript_Core/heap/CopiedBlockInlines.h	2015-10-08 03:12:17 UTC (rev 190704)
+++ trunk/Source/_javascript_Core/heap/CopiedBlockInlines.h	2015-10-08 03:48:20 UTC (rev 190705)
@@ -26,13 +26,11 @@
 #ifndef CopiedBlockInlines_h
 #define CopiedBlockInlines_h
 
-#include "ClassInfo.h"
 #include "CopiedBlock.h"
 #include "Heap.h"
-#include "MarkedBlock.h"
 
 namespace JSC {
-    
+
 inline void CopiedBlock::reportLiveBytes(LockHolder&, JSCell* owner, CopyToken token, unsigned bytes)
 {
     checkConsistency();

Modified: trunk/Source/_javascript_Core/heap/CopiedSpace.cpp (190704 => 190705)


--- trunk/Source/_javascript_Core/heap/CopiedSpace.cpp	2015-10-08 03:12:17 UTC (rev 190704)
+++ trunk/Source/_javascript_Core/heap/CopiedSpace.cpp	2015-10-08 03:48:20 UTC (rev 190705)
@@ -29,7 +29,6 @@
 #include "CopiedSpaceInlines.h"
 #include "GCActivityCallback.h"
 #include "JSCInlines.h"
-#include "Options.h"
 
 namespace JSC {

Modified: trunk/Source/_javascript_Core/heap/CopiedSpace.h (190704 => 190705)


--- trunk/Source/_javascript_Core/heap/CopiedSpace.h	2015-10-08 03:12:17 UTC (rev 190704)
+++ trunk/Source/_javascript_Core/heap/CopiedSpace.h	2015-10-08 03:48:20 UTC (rev 190705)
@@ -31,13 +31,9 @@
 #include "TinyBloomFilter.h"
 #include <wtf/Assertions.h>
 #include <wtf/CheckedBoolean.h>
-#include <wtf/Condition.h>
 #include <wtf/DoublyLinkedList.h>
 #include <wtf/HashSet.h>
 #include <wtf/Lock.h>
-#include <wtf/OSAllocator.h>
-#include <wtf/PageBlock.h>
-#include <wtf/StdLibExtras.h>
 
 namespace JSC {
 
@@ -66,7 +62,7 @@
     void startedEdenCopy();
     void startedFullCopy();
     void doneCopying();
-    bool isInCopyPhase() { return m_inCopyingPhase; }
+    bool isInCopyPhase() const { return m_inCopyingPhase; }
 
     void pin(CopiedBlock*);
     bool isPinned(void*);
@@ -80,7 +76,7 @@
     size_t capacity();
 
     bool isPagedOut(double deadline);
-    bool shouldDoCopyPhase() { return m_shouldDoCopyPhase; }
+    bool shouldDoCopyPhase() const { return m_shouldDoCopyPhase; }
 
     static CopiedBlock* blockFor(void*);
 
@@ -134,17 +130,16 @@
 
     CopiedGeneration m_oldGen;
     CopiedGeneration m_newGen;
-   
+
     bool m_inCopyingPhase;
     bool m_shouldDoCopyPhase;
 
-    Lock m_loanedBlocksLock; 
+    Lock m_loanedBlocksLock;
     size_t m_numberOfLoanedBlocks;
     
     size_t m_bytesRemovedFromOldSpaceDueToReallocation;
 
     static const size_t s_maxAllocationSize = CopiedBlock::blockSize / 2;
-    static const size_t s_initialBlockNum = 16;
     static const size_t s_blockMask = ~(CopiedBlock::blockSize - 1);
 };

Modified: trunk/Source/_javascript_Core/heap/CopiedSpaceInlines.h (190704 => 190705)


--- trunk/Source/_javascript_Core/heap/CopiedSpaceInlines.h	2015-10-08 03:12:17 UTC (rev 190704)
+++ trunk/Source/_javascript_Core/heap/CopiedSpaceInlines.h	2015-10-08 03:48:20 UTC (rev 190705)
@@ -30,7 +30,6 @@
 #include "CopiedSpace.h"
 #include "Heap.h"
 #include "VM.h"
-#include <wtf/CheckedBoolean.h>
 
 namespace JSC {
 
@@ -257,4 +256,3 @@
 } // namespace JSC
 
 #endif // CopiedSpaceInlines_h
-

Modified: trunk/Source/_javascript_Core/heap/CopyToken.h (190704 => 190705)


--- trunk/Source/_javascript_Core/heap/CopyToken.h	2015-10-08 03:12:17 UTC (rev 190704)
+++ trunk/Source/_javascript_Core/heap/CopyToken.h	2015-10-08 03:48:20 UTC (rev 190705)
@@ -38,4 +38,3 @@
 } // namespace JSC
 
 #endif // CopyToken_h
-

Modified: trunk/Source/_javascript_Core/heap/CopyVisitor.cpp (190704 => 190705)


--- trunk/Source/_javascript_Core/heap/CopyVisitor.cpp	2015-10-08 03:12:17 UTC (rev 190704)
+++ trunk/Source/_javascript_Core/heap/CopyVisitor.cpp	2015-10-08 03:48:20 UTC (rev 190705)
@@ -28,11 +28,6 @@
 
 #include "CopiedSpaceInlines.h"
 #include "CopyVisitorInlines.h"
-#include "CopyWorkList.h"
-#include "JSCell.h"
-#include "JSObject.h"
-#include "JSCInlines.h"
-#include <wtf/Threading.h>
 
 namespace JSC {

Modified: trunk/Source/_javascript_Core/heap/CopyVisitor.h (190704 => 190705)


--- trunk/Source/_javascript_Core/heap/CopyVisitor.h	2015-10-08 03:12:17 UTC (rev 190704)
+++ trunk/Source/_javascript_Core/heap/CopyVisitor.h	2015-10-08 03:48:20 UTC (rev 190705)
@@ -32,7 +32,6 @@
 namespace JSC {
 
 class Heap;
-class JSCell;
 
 class CopyVisitor {
     WTF_MAKE_NONCOPYABLE(CopyVisitor);

Modified: trunk/Source/_javascript_Core/heap/CopyVisitorInlines.h (190704 => 190705)


--- trunk/Source/_javascript_Core/heap/CopyVisitorInlines.h	2015-10-08 03:12:17 UTC (rev 190704)
+++ trunk/Source/_javascript_Core/heap/CopyVisitorInlines.h	2015-10-08 03:48:20 UTC (rev 190705)
@@ -26,11 +26,8 @@
 #ifndef CopyVisitorInlines_h
 #define CopyVisitorInlines_h
 
-#include "ClassInfo.h"
 #include "CopyVisitor.h"
 #include "Heap.h"
-#include "JSCell.h"
-#include "JSDestructibleObject.h"
 
 namespace JSC {
 
@@ -77,4 +74,3 @@
 } // namespace JSC
 
 #endif // CopyVisitorInlines_h
-

Modified: trunk/Source/_javascript_Core/heap/CopyWorkList.h (190704 => 190705)


--- trunk/Source/_javascript_Core/heap/CopyWorkList.h	2015-10-08 03:12:17 UTC (rev 190704)
+++ trunk/Source/_javascript_Core/heap/CopyWorkList.h	2015-10-08 03:48:20 UTC (rev 190705)
@@ -28,7 +28,6 @@
 
 #include "CopyToken.h"
 #include <wtf/DoublyLinkedList.h>
-#include <wtf/Vector.h>
 
 namespace JSC {

Modified: trunk/Source/_javascript_Core/heap/HandleBlock.h (190704 => 190705)


--- trunk/Source/_javascript_Core/heap/HandleBlock.h	2015-10-08 03:12:17 UTC (rev 190704)
+++ trunk/Source/_javascript_Core/heap/HandleBlock.h	2015-10-08 03:48:20 UTC (rev 190705)
@@ -30,7 +30,6 @@
 
 namespace JSC {
 
-class DeadBlock;
 class HandleSet;
 class HandleNode;

Modified: trunk/Source/_javascript_Core/heap/HandleSet.h (190704 => 190705)


--- trunk/Source/_javascript_Core/heap/HandleSet.h	2015-10-08 03:12:17 UTC (rev 190704)
+++ trunk/Source/_javascript_Core/heap/HandleSet.h	2015-10-08 03:48:20 UTC (rev 190705)
@@ -35,12 +35,10 @@
 
 namespace JSC {
 
-class HandleBlock;
 class HandleSet;
 class HeapRootVisitor;
 class VM;
 class JSValue;
-class SlotVisitor;
 
 class HandleNode {
 public:

Modified: trunk/Source/_javascript_Core/heap/HeapHelperPool.cpp (190704 => 190705)


--- trunk/Source/_javascript_Core/heap/HeapHelperPool.cpp	2015-10-08 03:12:17 UTC (rev 190704)
+++ trunk/Source/_javascript_Core/heap/HeapHelperPool.cpp	2015-10-08 03:48:20 UTC (rev 190705)
@@ -45,4 +45,3 @@
 }
 
 } // namespace JSC
-

Modified: trunk/Source/_javascript_Core/heap/HeapHelperPool.h (190704 => 190705)


--- trunk/Source/_javascript_Core/heap/HeapHelperPool.h	2015-10-08 03:12:17 UTC (rev 190704)
+++ trunk/Source/_javascript_Core/heap/HeapHelperPool.h	2015-10-08 03:48:20 UTC (rev 190705)
@@ -35,4 +35,3 @@
 } // namespace JSC
 
 #endif // HeapHelperPool_h
-

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to