<!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>[210119] 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/210119">210119</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2016-12-22 15:23:51 -0800 (Thu, 22 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>BytecodeGenerator::m_finallyDepth should be unsigned.
https://bugs.webkit.org/show_bug.cgi?id=166438
Reviewed by Saam Barati.
Also removed FinallyContext::m_finallyDepth because it is not used.
* bytecompiler/BytecodeGenerator.cpp:
(JSC::BytecodeGenerator::pushFinallyControlFlowScope):
(JSC::BytecodeGenerator::labelScopeDepth):
* bytecompiler/BytecodeGenerator.h:
(JSC::FinallyContext::FinallyContext):
(JSC::FinallyContext::finallyLabel):
(JSC::FinallyContext::depth): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorcpp">trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorh">trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (210118 => 210119)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-12-22 23:18:12 UTC (rev 210118)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-12-22 23:23:51 UTC (rev 210119)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2016-12-22 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><ins>+ BytecodeGenerator::m_finallyDepth should be unsigned.
+ https://bugs.webkit.org/show_bug.cgi?id=166438
+
+ Reviewed by Saam Barati.
+
+ Also removed FinallyContext::m_finallyDepth because it is not used.
+
+ * bytecompiler/BytecodeGenerator.cpp:
+ (JSC::BytecodeGenerator::pushFinallyControlFlowScope):
+ (JSC::BytecodeGenerator::labelScopeDepth):
+ * bytecompiler/BytecodeGenerator.h:
+ (JSC::FinallyContext::FinallyContext):
+ (JSC::FinallyContext::finallyLabel):
+ (JSC::FinallyContext::depth): Deleted.
+
+2016-12-22 Mark Lam <mark.lam@apple.com>
+
</ins><span class="cx"> De-duplicate finally blocks.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=160168
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp (210118 => 210119)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp 2016-12-22 23:18:12 UTC (rev 210118)
+++ trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp 2016-12-22 23:23:51 UTC (rev 210119)
</span><span class="lines">@@ -3687,7 +3687,7 @@
</span><span class="cx"> while (m_labelScopes.size() && !m_labelScopes.last().refCount())
</span><span class="cx"> m_labelScopes.removeLast();
</span><span class="cx">
</span><del>- ControlFlowScope scope(ControlFlowScope::Finally, currentLexicalScopeIndex(), FinallyContext(m_currentFinallyContext, finallyLabel, m_finallyDepth));
</del><ins>+ ControlFlowScope scope(ControlFlowScope::Finally, currentLexicalScopeIndex(), FinallyContext(m_currentFinallyContext, finallyLabel));
</ins><span class="cx"> m_controlFlowScopeStack.append(WTFMove(scope));
</span><span class="cx">
</span><span class="cx"> m_finallyDepth++;
</span><span class="lines">@@ -3886,8 +3886,8 @@
</span><span class="cx">
</span><span class="cx"> int BytecodeGenerator::labelScopeDepth() const
</span><span class="cx"> {
</span><del>- int depth = localScopeDepth() + m_finallyDepth;
- ASSERT(depth == static_cast<int>(m_controlFlowScopeStack.size()));
</del><ins>+ unsigned depth = localScopeDepth() + m_finallyDepth;
+ ASSERT(depth == m_controlFlowScopeStack.size());
</ins><span class="cx"> return depth;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h (210118 => 210119)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h 2016-12-22 23:18:12 UTC (rev 210118)
+++ trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h 2016-12-22 23:23:51 UTC (rev 210119)
</span><span class="lines">@@ -121,18 +121,15 @@
</span><span class="cx">
</span><span class="cx"> struct FinallyContext {
</span><span class="cx"> FinallyContext() { }
</span><del>- FinallyContext(FinallyContext* outerContext, Label* finallyLabel, int finallyDepth)
</del><ins>+ FinallyContext(FinallyContext* outerContext, Label* finallyLabel)
</ins><span class="cx"> : m_outerContext(outerContext)
</span><span class="cx"> , m_finallyLabel(finallyLabel)
</span><del>- , m_finallyDepth(finallyDepth)
</del><span class="cx"> {
</span><del>- ASSERT(m_finallyDepth >= 0);
</del><span class="cx"> ASSERT(m_jumps.isEmpty());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> FinallyContext* outerContext() const { return m_outerContext; }
</span><span class="cx"> Label* finallyLabel() const { return m_finallyLabel; }
</span><del>- int depth() const { return m_finallyDepth; }
</del><span class="cx">
</span><span class="cx"> uint32_t numberOfBreaksOrContinues() const { return m_numberOfBreaksOrContinues.unsafeGet(); }
</span><span class="cx"> void incNumberOfBreaksOrContinues() { m_numberOfBreaksOrContinues++; }
</span><span class="lines">@@ -151,7 +148,6 @@
</span><span class="cx"> private:
</span><span class="cx"> FinallyContext* m_outerContext { nullptr };
</span><span class="cx"> Label* m_finallyLabel { nullptr };
</span><del>- int m_finallyDepth { 0 };
</del><span class="cx"> Checked<uint32_t, WTF::CrashOnOverflow> m_numberOfBreaksOrContinues;
</span><span class="cx"> bool m_handlesReturns { false };
</span><span class="cx"> Vector<FinallyJump> m_jumps;
</span><span class="lines">@@ -1091,7 +1087,7 @@
</span><span class="cx"> SegmentedVector<RegisterID, 32> m_parameters;
</span><span class="cx"> SegmentedVector<Label, 32> m_labels;
</span><span class="cx"> LabelScopeStore m_labelScopes;
</span><del>- int m_finallyDepth { 0 };
</del><ins>+ unsigned m_finallyDepth { 0 };
</ins><span class="cx"> int m_localScopeDepth { 0 };
</span><span class="cx"> const CodeType m_codeType;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>