<!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>[165109] 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/165109">165109</a></dd>
<dt>Author</dt> <dd>mhahnenberg@apple.com</dd>
<dt>Date</dt> <dd>2014-03-05 08:46:23 -0800 (Wed, 05 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use range-based loops where possible in Heap methods
https://bugs.webkit.org/show_bug.cgi?id=129513
Reviewed by Mark Lam.
Replace old school iterator based loops with the new range-based loop hotness
for a better tomorrow.
* heap/CodeBlockSet.cpp:
(JSC::CodeBlockSet::~CodeBlockSet):
(JSC::CodeBlockSet::clearMarks):
(JSC::CodeBlockSet::deleteUnmarkedAndUnreferenced):
(JSC::CodeBlockSet::traceMarked):
* heap/Heap.cpp:
(JSC::Heap::visitProtectedObjects):
(JSC::Heap::visitTempSortVectors):
(JSC::Heap::clearRememberedSet):
* heap/Heap.h:
(JSC::Heap::forEachProtectedCell):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapCodeBlockSetcpp">trunk/Source/JavaScriptCore/heap/CodeBlockSet.cpp</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (165108 => 165109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog        2014-03-05 15:48:29 UTC (rev 165108)
+++ trunk/Source/JavaScriptCore/ChangeLog        2014-03-05 16:46:23 UTC (rev 165109)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-03-05 Mark Hahnenberg <mhahnenberg@apple.com>
+
+ Use range-based loops where possible in Heap methods
+ https://bugs.webkit.org/show_bug.cgi?id=129513
+
+ Reviewed by Mark Lam.
+
+ Replace old school iterator based loops with the new range-based loop hotness
+ for a better tomorrow.
+
+ * heap/CodeBlockSet.cpp:
+ (JSC::CodeBlockSet::~CodeBlockSet):
+ (JSC::CodeBlockSet::clearMarks):
+ (JSC::CodeBlockSet::deleteUnmarkedAndUnreferenced):
+ (JSC::CodeBlockSet::traceMarked):
+ * heap/Heap.cpp:
+ (JSC::Heap::visitProtectedObjects):
+ (JSC::Heap::visitTempSortVectors):
+ (JSC::Heap::clearRememberedSet):
+ * heap/Heap.h:
+ (JSC::Heap::forEachProtectedCell):
+
</ins><span class="cx"> 2014-03-04 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> DFG and FTL should specialize for and support CompareStrictEq over Misc (i.e. boolean, undefined, or null)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapCodeBlockSetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/CodeBlockSet.cpp (165108 => 165109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/CodeBlockSet.cpp        2014-03-05 15:48:29 UTC (rev 165108)
+++ trunk/Source/JavaScriptCore/heap/CodeBlockSet.cpp        2014-03-05 16:46:23 UTC (rev 165109)
</span><span class="lines">@@ -41,10 +41,8 @@
</span><span class="cx">
</span><span class="cx"> CodeBlockSet::~CodeBlockSet()
</span><span class="cx"> {
</span><del>- HashSet<CodeBlock*>::iterator iter = m_set.begin();
- HashSet<CodeBlock*>::iterator end = m_set.end();
- for (; iter != end; ++iter)
- (*iter)->deref();
</del><ins>+ for (CodeBlock* codeBlock : m_set)
+ codeBlock->deref();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CodeBlockSet::add(PassRefPtr<CodeBlock> codeBlock)
</span><span class="lines">@@ -56,10 +54,7 @@
</span><span class="cx">
</span><span class="cx"> void CodeBlockSet::clearMarks()
</span><span class="cx"> {
</span><del>- HashSet<CodeBlock*>::iterator iter = m_set.begin();
- HashSet<CodeBlock*>::iterator end = m_set.end();
- for (; iter != end; ++iter) {
- CodeBlock* codeBlock = *iter;
</del><ins>+ for (CodeBlock* codeBlock : m_set) {
</ins><span class="cx"> codeBlock->m_mayBeExecuting = false;
</span><span class="cx"> codeBlock->m_visitAggregateHasBeenCalled = false;
</span><span class="cx"> }
</span><span class="lines">@@ -75,10 +70,7 @@
</span><span class="cx"> if (verbose)
</span><span class="cx"> dataLog("Fixpointing over unmarked, set size = ", m_set.size(), "...\n");
</span><span class="cx"> for (;;) {
</span><del>- HashSet<CodeBlock*>::iterator iter = m_set.begin();
- HashSet<CodeBlock*>::iterator end = m_set.end();
- for (; iter != end; ++iter) {
- CodeBlock* codeBlock = *iter;
</del><ins>+ for (CodeBlock* codeBlock : m_set) {
</ins><span class="cx"> if (!codeBlock->hasOneRef())
</span><span class="cx"> continue;
</span><span class="cx"> if (codeBlock->m_mayBeExecuting)
</span><span class="lines">@@ -90,8 +82,8 @@
</span><span class="cx"> dataLog(" Removing ", toRemove.size(), " blocks.\n");
</span><span class="cx"> if (toRemove.isEmpty())
</span><span class="cx"> break;
</span><del>- for (unsigned i = toRemove.size(); i--;)
- m_set.remove(toRemove[i]);
</del><ins>+ for (CodeBlock* codeBlock : toRemove)
+ m_set.remove(codeBlock);
</ins><span class="cx"> toRemove.resize(0);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -106,10 +98,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (verbose)
</span><span class="cx"> dataLog("Tracing ", m_set.size(), " code blocks.\n");
</span><del>- HashSet<CodeBlock*>::iterator iter = m_set.begin();
- HashSet<CodeBlock*>::iterator end = m_set.end();
- for (; iter != end; ++iter) {
- CodeBlock* codeBlock = *iter;
</del><ins>+ for (CodeBlock* codeBlock : m_set) {
</ins><span class="cx"> if (!codeBlock->m_mayBeExecuting)
</span><span class="cx"> continue;
</span><span class="cx"> codeBlock->visitAggregate(visitor);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapHeapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/Heap.cpp (165108 => 165109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/Heap.cpp        2014-03-05 15:48:29 UTC (rev 165108)
+++ trunk/Source/JavaScriptCore/heap/Heap.cpp        2014-03-05 16:46:23 UTC (rev 165109)
</span><span class="lines">@@ -568,9 +568,9 @@
</span><span class="cx"> {
</span><span class="cx"> GCPHASE(VisitProtectedObjects);
</span><span class="cx"> MARK_LOG_ROOT(m_slotVisitor, "Protected Objects");
</span><del>- ProtectCountSet::iterator end = m_protectedValues.end();
- for (ProtectCountSet::iterator it = m_protectedValues.begin(); it != end; ++it)
- heapRootVisitor.visit(&it->key);
</del><ins>+
+ for (auto pair : m_protectedValues)
+ heapRootVisitor.visit(&pair.key);
</ins><span class="cx"> m_slotVisitor.donateAndDrain();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -581,14 +581,10 @@
</span><span class="cx">
</span><span class="cx"> typedef Vector<Vector<ValueStringPair, 0, UnsafeVectorOverflow>* > VectorOfValueStringVectors;
</span><span class="cx">
</span><del>- VectorOfValueStringVectors::iterator end = m_tempSortingVectors.end();
- for (VectorOfValueStringVectors::iterator it = m_tempSortingVectors.begin(); it != end; ++it) {
- Vector<ValueStringPair, 0, UnsafeVectorOverflow>* tempSortingVector = *it;
-
- Vector<ValueStringPair>::iterator vectorEnd = tempSortingVector->end();
- for (Vector<ValueStringPair>::iterator vectorIt = tempSortingVector->begin(); vectorIt != vectorEnd; ++vectorIt) {
- if (vectorIt->first)
- heapRootVisitor.visit(&vectorIt->first);
</del><ins>+ for (auto vector : m_tempSortingVectors) {
+ for (auto valueStringPair : *vector) {
+ if (valueStringPair.first)
+ heapRootVisitor.visit(&valueStringPair.first);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> m_slotVisitor.donateAndDrain();
</span><span class="lines">@@ -672,10 +668,8 @@
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(GGC)
</span><span class="cx"> GCPHASE(ClearRememberedSet);
</span><del>- for (unsigned i = 0; i < rememberedSet.size(); ++i) {
- const JSCell* cell = rememberedSet[i];
</del><ins>+ for (auto cell : rememberedSet)
</ins><span class="cx"> MarkedBlock::blockFor(cell)->clearRemembered(cell);
</span><del>- }
</del><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(rememberedSet);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapHeaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/Heap.h (165108 => 165109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/Heap.h        2014-03-05 15:48:29 UTC (rev 165108)
+++ trunk/Source/JavaScriptCore/heap/Heap.h        2014-03-05 16:46:23 UTC (rev 165109)
</span><span class="lines">@@ -451,9 +451,8 @@
</span><span class="cx">
</span><span class="cx"> template<typename Functor> inline typename Functor::ReturnType Heap::forEachProtectedCell(Functor& functor)
</span><span class="cx"> {
</span><del>- ProtectCountSet::iterator end = m_protectedValues.end();
- for (ProtectCountSet::iterator it = m_protectedValues.begin(); it != end; ++it)
- functor(it->key);
</del><ins>+ for (auto pair : m_protectedValues)
+ functor(pair.key);
</ins><span class="cx"> m_handleSet.forEachStrongHandle(functor, m_protectedValues);
</span><span class="cx">
</span><span class="cx"> return functor.returnValue();
</span></span></pre>
</div>
</div>
</body>
</html>