<!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>[162277] 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/162277">162277</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2014-01-18 15:09:48 -0800 (Sat, 18 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>CodeBlock: Size m_exceptionHandlers to fit from creation.
<https://webkit.org/b/127234>
Avoid allocation churn for CodeBlock::m_exceptionHandlers.
Reviewed by Anders Carlsson.
* bytecode/CodeBlock.h:
Removed unused CodeBlock::allocateHandlers() function.
* bytecode/CodeBlock.cpp:
(JSC::CodeBlock::CodeBlock):
Use resizeToFit() instead of grow() for m_exceptionHandlers
since we know it's never going to change size.
(JSC::CodeBlock::shrinkToFit):
No need to shrink m_exceptionHandlers here since it's already
the perfect size.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeCodeBlockcpp">trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeCodeBlockh">trunk/Source/JavaScriptCore/bytecode/CodeBlock.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (162276 => 162277)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-01-18 23:00:21 UTC (rev 162276)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-01-18 23:09:48 UTC (rev 162277)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-01-18 Andreas Kling <akling@apple.com>
+
+ CodeBlock: Size m_exceptionHandlers to fit from creation.
+ <https://webkit.org/b/127234>
+
+ Avoid allocation churn for CodeBlock::m_exceptionHandlers.
+
+ Reviewed by Anders Carlsson.
+
+ * bytecode/CodeBlock.h:
+
+ Removed unused CodeBlock::allocateHandlers() function.
+
+ * bytecode/CodeBlock.cpp:
+ (JSC::CodeBlock::CodeBlock):
+
+ Use resizeToFit() instead of grow() for m_exceptionHandlers
+ since we know it's never going to change size.
+
+ (JSC::CodeBlock::shrinkToFit):
+
+ No need to shrink m_exceptionHandlers here since it's already
+ the perfect size.
+
</ins><span class="cx"> 2014-01-18 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> Add a hasBreakpointFlag arg to the op_debug bytecode.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeCodeBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp (162276 => 162277)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2014-01-18 23:00:21 UTC (rev 162276)
+++ trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2014-01-18 23:09:48 UTC (rev 162277)
</span><span class="lines">@@ -1601,7 +1601,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> if (size_t count = unlinkedCodeBlock->numberOfExceptionHandlers()) {
</span><del>- m_rareData->m_exceptionHandlers.grow(count);
</del><ins>+ m_rareData->m_exceptionHandlers.resizeToFit(count);
</ins><span class="cx"> size_t nonLocalScopeDepth = scope->depth();
</span><span class="cx"> for (size_t i = 0; i < count; i++) {
</span><span class="cx"> const UnlinkedHandlerInfo& handler = unlinkedCodeBlock->exceptionHandler(i);
</span><span class="lines">@@ -2601,9 +2601,6 @@
</span><span class="cx"> m_rareData->m_stringSwitchJumpTables.shrinkToFit();
</span><span class="cx"> }
</span><span class="cx"> } // else don't shrink these, because we would have already pointed pointers into these tables.
</span><del>-
- if (m_rareData)
- m_rareData->m_exceptionHandlers.shrinkToFit();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CodeBlock::createActivation(CallFrame* callFrame)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeCodeBlockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/CodeBlock.h (162276 => 162277)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/CodeBlock.h 2014-01-18 23:00:21 UTC (rev 162276)
+++ trunk/Source/JavaScriptCore/bytecode/CodeBlock.h 2014-01-18 23:09:48 UTC (rev 162277)
</span><span class="lines">@@ -545,21 +545,6 @@
</span><span class="cx"> // Exception handling support
</span><span class="cx">
</span><span class="cx"> size_t numberOfExceptionHandlers() const { return m_rareData ? m_rareData->m_exceptionHandlers.size() : 0; }
</span><del>- void allocateHandlers(const Vector<UnlinkedHandlerInfo>& unlinkedHandlers)
- {
- size_t count = unlinkedHandlers.size();
- if (!count)
- return;
- createRareDataIfNecessary();
- m_rareData->m_exceptionHandlers.resize(count);
- for (size_t i = 0; i < count; ++i) {
- m_rareData->m_exceptionHandlers[i].start = unlinkedHandlers[i].start;
- m_rareData->m_exceptionHandlers[i].end = unlinkedHandlers[i].end;
- m_rareData->m_exceptionHandlers[i].target = unlinkedHandlers[i].target;
- m_rareData->m_exceptionHandlers[i].scopeDepth = unlinkedHandlers[i].scopeDepth;
- }
-
- }
</del><span class="cx"> HandlerInfo& exceptionHandler(int index) { RELEASE_ASSERT(m_rareData); return m_rareData->m_exceptionHandlers[index]; }
</span><span class="cx">
</span><span class="cx"> bool hasExpressionInfo() { return m_unlinkedCode->hasExpressionInfo(); }
</span></span></pre>
</div>
</div>
</body>
</html>