<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[190888] trunk/Source/JavaScriptCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/190888">190888</a></dd>
<dt>Author</dt> <dd>joepeck@webkit.org</dd>
<dt>Date</dt> <dd>2015-10-12 14:29:21 -0700 (Mon, 12 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Cleanup Heap.h and some related headers
https://bugs.webkit.org/show_bug.cgi?id=149981
Reviewed by Geoffrey Garen.
* heap/Heap.h:
- Some functions did not need export.
- threadDupStrings never had an implementation.
* heap/ConservativeRoots.cpp:
* heap/ConservativeRoots.h:
* heap/Heap.cpp:
* heap/ListableHandler.h:
* heap/WeakReferenceHarvester.h:
* jit/Repatch.cpp:
* runtime/JSONObject.h:
* runtime/VM.h:
- Stale forward declarations / includes.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapConservativeRootscpp">trunk/Source/JavaScriptCore/heap/ConservativeRoots.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapConservativeRootsh">trunk/Source/JavaScriptCore/heap/ConservativeRoots.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapHeapcpp">trunk/Source/JavaScriptCore/heap/Heap.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapHeaph">trunk/Source/JavaScriptCore/heap/Heap.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapListableHandlerh">trunk/Source/JavaScriptCore/heap/ListableHandler.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapWeakReferenceHarvesterh">trunk/Source/JavaScriptCore/heap/WeakReferenceHarvester.h</a></li>
<li><a href="#trunkSourceJavaScriptCorejitRepatchcpp">trunk/Source/JavaScriptCore/jit/Repatch.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSONObjecth">trunk/Source/JavaScriptCore/runtime/JSONObject.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeVMh">trunk/Source/JavaScriptCore/runtime/VM.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (190887 => 190888)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-10-12 21:22:01 UTC (rev 190887)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-10-12 21:29:21 UTC (rev 190888)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-10-12 Joseph Pecoraro <pecoraro@apple.com>
+
+ Cleanup Heap.h and some related headers
+ https://bugs.webkit.org/show_bug.cgi?id=149981
+
+ Reviewed by Geoffrey Garen.
+
+ * heap/Heap.h:
+ - Some functions did not need export.
+ - threadDupStrings never had an implementation.
+
+ * heap/ConservativeRoots.cpp:
+ * heap/ConservativeRoots.h:
+ * heap/Heap.cpp:
+ * heap/ListableHandler.h:
+ * heap/WeakReferenceHarvester.h:
+ * jit/Repatch.cpp:
+ * runtime/JSONObject.h:
+ * runtime/VM.h:
+ - Stale forward declarations / includes.
+
</ins><span class="cx"> 2015-10-12 Saam barati <sbarati@apple.com>
</span><span class="cx">
</span><span class="cx"> Each *ById inline cache in the FTL must have its own CallSiteIndex
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapConservativeRootscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/ConservativeRoots.cpp (190887 => 190888)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/ConservativeRoots.cpp 2015-10-12 21:22:01 UTC (rev 190887)
+++ trunk/Source/JavaScriptCore/heap/ConservativeRoots.cpp 2015-10-12 21:29:21 UTC (rev 190888)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> #include "JSObject.h"
</span><span class="cx"> #include "JSCInlines.h"
</span><span class="cx"> #include "Structure.h"
</span><ins>+#include <wtf/OSAllocator.h>
</ins><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapConservativeRootsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/ConservativeRoots.h (190887 => 190888)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/ConservativeRoots.h 2015-10-12 21:22:01 UTC (rev 190887)
+++ trunk/Source/JavaScriptCore/heap/ConservativeRoots.h 2015-10-12 21:29:21 UTC (rev 190888)
</span><span class="lines">@@ -27,13 +27,10 @@
</span><span class="cx"> #define ConservativeRoots_h
</span><span class="cx">
</span><span class="cx"> #include "Heap.h"
</span><del>-#include <wtf/OSAllocator.h>
-#include <wtf/Vector.h>
</del><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><span class="cx"> class CodeBlockSet;
</span><del>-class Heap;
</del><span class="cx"> class JITStubRoutineSet;
</span><span class="cx"> class JSCell;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapHeapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/Heap.cpp (190887 => 190888)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/Heap.cpp 2015-10-12 21:22:01 UTC (rev 190887)
+++ trunk/Source/JavaScriptCore/heap/Heap.cpp 2015-10-12 21:29:21 UTC (rev 190888)
</span><span class="lines">@@ -38,22 +38,20 @@
</span><span class="cx"> #include "HeapVerifier.h"
</span><span class="cx"> #include "IncrementalSweeper.h"
</span><span class="cx"> #include "Interpreter.h"
</span><ins>+#include "JSCInlines.h"
</ins><span class="cx"> #include "JSGlobalObject.h"
</span><span class="cx"> #include "JSLock.h"
</span><del>-#include "JSONObject.h"
-#include "JSCInlines.h"
</del><span class="cx"> #include "JSVirtualMachineInternal.h"
</span><del>-#include "RegExpCache.h"
</del><span class="cx"> #include "Tracing.h"
</span><span class="cx"> #include "TypeProfilerLog.h"
</span><span class="cx"> #include "UnlinkedCodeBlock.h"
</span><span class="cx"> #include "VM.h"
</span><span class="cx"> #include "WeakSetInlines.h"
</span><span class="cx"> #include <algorithm>
</span><del>-#include <wtf/RAMSize.h>
</del><span class="cx"> #include <wtf/CurrentTime.h>
</span><span class="cx"> #include <wtf/ParallelVectorIterator.h>
</span><span class="cx"> #include <wtf/ProcessID.h>
</span><ins>+#include <wtf/RAMSize.h>
</ins><span class="cx">
</span><span class="cx"> using namespace std;
</span><span class="cx"> using namespace JSC;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapHeaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/Heap.h (190887 => 190888)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/Heap.h 2015-10-12 21:22:01 UTC (rev 190887)
+++ trunk/Source/JavaScriptCore/heap/Heap.h 2015-10-12 21:29:21 UTC (rev 190888)
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx">
</span><span class="cx"> Heap(VM*, HeapType);
</span><span class="cx"> ~Heap();
</span><del>- JS_EXPORT_PRIVATE void lastChanceToFinalize();
</del><ins>+ void lastChanceToFinalize();
</ins><span class="cx"> void releaseDelayedReleasedObjects();
</span><span class="cx">
</span><span class="cx"> VM* vm() const { return m_vm; }
</span><span class="lines">@@ -207,7 +207,7 @@
</span><span class="cx"> size_t sizeBeforeLastFullCollection() const { return m_sizeBeforeLastFullCollect; }
</span><span class="cx"> size_t sizeAfterLastFullCollection() const { return m_sizeAfterLastFullCollect; }
</span><span class="cx">
</span><del>- JS_EXPORT_PRIVATE void deleteAllCodeBlocks();
</del><ins>+ void deleteAllCodeBlocks();
</ins><span class="cx"> void deleteAllUnlinkedCodeBlocks();
</span><span class="cx">
</span><span class="cx"> void didAllocate(size_t);
</span><span class="lines">@@ -252,7 +252,6 @@
</span><span class="cx"> friend class CopiedSpace;
</span><span class="cx"> friend class CopyVisitor;
</span><span class="cx"> friend class SlotVisitor;
</span><del>- friend class SuperRegion;
</del><span class="cx"> friend class IncrementalSweeper;
</span><span class="cx"> friend class HeapStatistics;
</span><span class="cx"> friend class VM;
</span><span class="lines">@@ -340,7 +339,6 @@
</span><span class="cx"> size_t threadVisitCount();
</span><span class="cx"> size_t threadBytesVisited();
</span><span class="cx"> size_t threadBytesCopied();
</span><del>- size_t threadDupStrings();
</del><span class="cx">
</span><span class="cx"> const HeapType m_heapType;
</span><span class="cx"> const size_t m_ramSize;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapListableHandlerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/ListableHandler.h (190887 => 190888)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/ListableHandler.h 2015-10-12 21:22:01 UTC (rev 190887)
+++ trunk/Source/JavaScriptCore/heap/ListableHandler.h 2015-10-12 21:29:21 UTC (rev 190888)
</span><span class="lines">@@ -29,8 +29,6 @@
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><span class="cx"> class Heap;
</span><del>-class MarkStack;
-class MarkStackThreadSharedData;
</del><span class="cx"> class SlotVisitor;
</span><span class="cx">
</span><span class="cx"> template<typename T>
</span><span class="lines">@@ -53,7 +51,6 @@
</span><span class="cx"> private:
</span><span class="cx"> // Allow these classes to use ListableHandler::List.
</span><span class="cx"> friend class Heap;
</span><del>- friend class MarkStack;
</del><span class="cx"> friend class SlotVisitor;
</span><span class="cx">
</span><span class="cx"> class List {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapWeakReferenceHarvesterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/WeakReferenceHarvester.h (190887 => 190888)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/WeakReferenceHarvester.h 2015-10-12 21:22:01 UTC (rev 190887)
+++ trunk/Source/JavaScriptCore/heap/WeakReferenceHarvester.h 2015-10-12 21:29:21 UTC (rev 190888)
</span><span class="lines">@@ -24,8 +24,6 @@
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><del>-class MarkStack;
-class MarkStackSharedData;
</del><span class="cx"> class SlotVisitor;
</span><span class="cx">
</span><span class="cx"> class WeakReferenceHarvester : public ListableHandler<WeakReferenceHarvester> {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitRepatchcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/Repatch.cpp (190887 => 190888)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/Repatch.cpp 2015-10-12 21:22:01 UTC (rev 190887)
+++ trunk/Source/JavaScriptCore/jit/Repatch.cpp 2015-10-12 21:29:21 UTC (rev 190888)
</span><span class="lines">@@ -41,7 +41,6 @@
</span><span class="cx"> #include "LinkBuffer.h"
</span><span class="cx"> #include "JSCInlines.h"
</span><span class="cx"> #include "PolymorphicAccess.h"
</span><del>-#include "RegExpMatchesArray.h"
</del><span class="cx"> #include "ScratchRegisterAllocator.h"
</span><span class="cx"> #include "StackAlignment.h"
</span><span class="cx"> #include "StructureRareDataInlines.h"
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSONObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSONObject.h (190887 => 190888)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSONObject.h 2015-10-12 21:22:01 UTC (rev 190887)
+++ trunk/Source/JavaScriptCore/runtime/JSONObject.h 2015-10-12 21:29:21 UTC (rev 190888)
</span><span class="lines">@@ -30,8 +30,6 @@
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><del>-class Stringifier;
-
</del><span class="cx"> class JSONObject : public JSNonFinalObject {
</span><span class="cx"> public:
</span><span class="cx"> typedef JSNonFinalObject Base;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeVMh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/VM.h (190887 => 190888)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/VM.h 2015-10-12 21:22:01 UTC (rev 190887)
+++ trunk/Source/JavaScriptCore/runtime/VM.h 2015-10-12 21:29:21 UTC (rev 190888)
</span><span class="lines">@@ -97,7 +97,6 @@
</span><span class="cx"> class SourceProvider;
</span><span class="cx"> class SourceProviderCache;
</span><span class="cx"> struct StackFrame;
</span><del>-class Stringifier;
</del><span class="cx"> class Structure;
</span><span class="cx"> #if ENABLE(REGEXP_TRACING)
</span><span class="cx"> class RegExp;
</span></span></pre>
</div>
</div>
</body>
</html>