<!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>[178984] 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/178984">178984</a></dd>
<dt>Author</dt> <dd>mhahnenb@gmail.com</dd>
<dt>Date</dt> <dd>2015-01-22 23:04:05 -0800 (Thu, 22 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>EdenCollections unnecessarily visit SmallStrings
https://bugs.webkit.org/show_bug.cgi?id=140762
Reviewed by Geoffrey Garen.
* heap/Heap.cpp:
(JSC::Heap::copyBackingStores): Also added a GCPhase for copying
backing stores, which is a significant portion of garbage collection.
(JSC::Heap::visitSmallStrings): Check to see if we need to visit
SmallStrings based on the collection type.
* runtime/SmallStrings.cpp:
(JSC::SmallStrings::SmallStrings):
(JSC::SmallStrings::visitStrongReferences): Set the fact that we have
visited the SmallStrings since the last modification.
* runtime/SmallStrings.h:
(JSC::SmallStrings::needsToBeVisited): If we're doing a
FullCollection, we need to visit. Otherwise, it depends on whether
we've been visited since the last modification/allocation.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapHeapcpp">trunk/Source/JavaScriptCore/heap/Heap.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeSmallStringscpp">trunk/Source/JavaScriptCore/runtime/SmallStrings.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeSmallStringsh">trunk/Source/JavaScriptCore/runtime/SmallStrings.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (178983 => 178984)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-01-23 06:26:28 UTC (rev 178983)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-01-23 07:04:05 UTC (rev 178984)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-01-22 Mark Hahnenberg <mhahnenb@gmail.com>
+
+ EdenCollections unnecessarily visit SmallStrings
+ https://bugs.webkit.org/show_bug.cgi?id=140762
+
+ Reviewed by Geoffrey Garen.
+
+ * heap/Heap.cpp:
+ (JSC::Heap::copyBackingStores): Also added a GCPhase for copying
+ backing stores, which is a significant portion of garbage collection.
+ (JSC::Heap::visitSmallStrings): Check to see if we need to visit
+ SmallStrings based on the collection type.
+ * runtime/SmallStrings.cpp:
+ (JSC::SmallStrings::SmallStrings):
+ (JSC::SmallStrings::visitStrongReferences): Set the fact that we have
+ visited the SmallStrings since the last modification.
+ * runtime/SmallStrings.h:
+ (JSC::SmallStrings::needsToBeVisited): If we're doing a
+ FullCollection, we need to visit. Otherwise, it depends on whether
+ we've been visited since the last modification/allocation.
+
</ins><span class="cx"> 2015-01-22 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Add a build flag for ES6 class syntax
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapHeapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/Heap.cpp (178983 => 178984)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/Heap.cpp 2015-01-23 06:26:28 UTC (rev 178983)
+++ trunk/Source/JavaScriptCore/heap/Heap.cpp 2015-01-23 07:04:05 UTC (rev 178984)
</span><span class="lines">@@ -547,6 +547,7 @@
</span><span class="cx">
</span><span class="cx"> void Heap::copyBackingStores()
</span><span class="cx"> {
</span><ins>+ GCPHASE(CopyBackingStores);
</ins><span class="cx"> if (m_operationInProgress == EdenCollection)
</span><span class="cx"> m_storageSpace.startedCopying<EdenCollection>();
</span><span class="cx"> else {
</span><span class="lines">@@ -611,11 +612,12 @@
</span><span class="cx"> void Heap::visitSmallStrings()
</span><span class="cx"> {
</span><span class="cx"> GCPHASE(VisitSmallStrings);
</span><ins>+ if (!m_vm->smallStrings.needsToBeVisited(m_operationInProgress))
+ return;
+
</ins><span class="cx"> m_vm->smallStrings.visitStrongReferences(m_slotVisitor);
</span><del>-
</del><span class="cx"> if (Options::logGC() == GCLogging::Verbose)
</span><span class="cx"> dataLog("Small strings:\n", m_slotVisitor);
</span><del>-
</del><span class="cx"> m_slotVisitor.donateAndDrain();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeSmallStringscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/SmallStrings.cpp (178983 => 178984)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/SmallStrings.cpp 2015-01-23 06:26:28 UTC (rev 178983)
+++ trunk/Source/JavaScriptCore/runtime/SmallStrings.cpp 2015-01-23 07:04:05 UTC (rev 178984)
</span><span class="lines">@@ -68,6 +68,7 @@
</span><span class="cx"> #undef JSC_COMMON_STRINGS_ATTRIBUTE_INITIALIZE
</span><span class="cx"> , m_nullObjectString(nullptr)
</span><span class="cx"> , m_undefinedObjectString(nullptr)
</span><ins>+ , m_needsToBeVisited(true)
</ins><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(singleCharacterStringCount == sizeof(m_singleCharacterStrings) / sizeof(m_singleCharacterStrings[0]), IsNumCharactersConstInSyncWithClassUsage);
</span><span class="cx">
</span><span class="lines">@@ -89,6 +90,7 @@
</span><span class="cx">
</span><span class="cx"> void SmallStrings::visitStrongReferences(SlotVisitor& visitor)
</span><span class="cx"> {
</span><ins>+ m_needsToBeVisited = false;
</ins><span class="cx"> visitor.appendUnbarrieredPointer(&m_emptyString);
</span><span class="cx"> for (unsigned i = 0; i <= maxSingleCharacterString; ++i)
</span><span class="cx"> visitor.appendUnbarrieredPointer(m_singleCharacterStrings + i);
</span><span class="lines">@@ -107,6 +109,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_emptyString);
</span><span class="cx"> m_emptyString = JSString::createHasOtherOwner(*vm, StringImpl::empty());
</span><ins>+ m_needsToBeVisited = true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SmallStrings::createSingleCharacterString(VM* vm, unsigned char character)
</span><span class="lines">@@ -115,6 +118,7 @@
</span><span class="cx"> m_storage = std::make_unique<SmallStringsStorage>();
</span><span class="cx"> ASSERT(!m_singleCharacterStrings[character]);
</span><span class="cx"> m_singleCharacterStrings[character] = JSString::createHasOtherOwner(*vm, PassRefPtr<StringImpl>(m_storage->rep(character)));
</span><ins>+ m_needsToBeVisited = true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> StringImpl* SmallStrings::singleCharacterStringRep(unsigned char character)
</span><span class="lines">@@ -124,9 +128,10 @@
</span><span class="cx"> return m_storage->rep(character);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SmallStrings::initialize(VM* vm, JSString*& string, const char* value) const
</del><ins>+void SmallStrings::initialize(VM* vm, JSString*& string, const char* value)
</ins><span class="cx"> {
</span><span class="cx"> string = JSString::create(*vm, StringImpl::create(value));
</span><ins>+ m_needsToBeVisited = true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeSmallStringsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/SmallStrings.h (178983 => 178984)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/SmallStrings.h 2015-01-23 06:26:28 UTC (rev 178983)
+++ trunk/Source/JavaScriptCore/runtime/SmallStrings.h 2015-01-23 07:04:05 UTC (rev 178984)
</span><span class="lines">@@ -88,13 +88,20 @@
</span><span class="cx"> JSString* nullObjectString() const { return m_nullObjectString; }
</span><span class="cx"> JSString* undefinedObjectString() const { return m_undefinedObjectString; }
</span><span class="cx">
</span><ins>+ bool needsToBeVisited(HeapOperation collectionType) const
+ {
+ if (collectionType == FullCollection)
+ return true;
+ return m_needsToBeVisited;
+ }
+
</ins><span class="cx"> private:
</span><span class="cx"> static const unsigned singleCharacterStringCount = maxSingleCharacterString + 1;
</span><span class="cx">
</span><span class="cx"> JS_EXPORT_PRIVATE void createEmptyString(VM*);
</span><span class="cx"> JS_EXPORT_PRIVATE void createSingleCharacterString(VM*, unsigned char);
</span><span class="cx">
</span><del>- void initialize(VM*, JSString*&, const char* value) const;
</del><ins>+ void initialize(VM*, JSString*&, const char* value);
</ins><span class="cx">
</span><span class="cx"> JSString* m_emptyString;
</span><span class="cx"> #define JSC_COMMON_STRINGS_ATTRIBUTE_DECLARATION(name) JSString* m_##name;
</span><span class="lines">@@ -104,6 +111,7 @@
</span><span class="cx"> JSString* m_undefinedObjectString;
</span><span class="cx"> JSString* m_singleCharacterStrings[singleCharacterStringCount];
</span><span class="cx"> std::unique_ptr<SmallStringsStorage> m_storage;
</span><ins>+ bool m_needsToBeVisited;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace JSC
</span></span></pre>
</div>
</div>
</body>
</html>