<!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>[203315] 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/203315">203315</a></dd>

<dt>Author</dt> <dd>mark.lam@apple.com</dd>

<dt>Date</dt> <dd>2016-07-15 18:14:57 -0700 (Fri, 15 Jul 2016)</dd>

</dl>

<h3>Log Message</h3>

<pre>Assertion failures and crashes with missing TDZ checks for catch-node bindings.

https://bugs.webkit.org/show_bug.cgi?id=158797

Reviewed by Saam Barati.

* bytecompiler/BytecodeGenerator.cpp:

(JSC::BytecodeGenerator::emitPushCatchScope):

(JSC::BytecodeGenerator::emitPopCatchScope):

* tests/stress/catch-clause-should-be-under-tdz1.js: Added.

* tests/stress/catch-clause-should-be-under-tdz2.js: Added.

* tests/stress/catch-clause-should-be-under-tdz3.js: Added.

* tests/stress/catch-clause-should-be-under-tdz4.js: Added.

* tests/stress/catch-clause-should-be-under-tdz5.js: Added.</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>

</ul>

<h3>Added Paths</h3>

<ul>

<li><a href="#trunkSourceJavaScriptCoretestsstresscatchclauseshouldbeundertdz1js">trunk/Source/JavaScriptCore/tests/stress/catch-clause-should-be-under-tdz1.js</a></li>

<li><a href="#trunkSourceJavaScriptCoretestsstresscatchclauseshouldbeundertdz2js">trunk/Source/JavaScriptCore/tests/stress/catch-clause-should-be-under-tdz2.js</a></li>

<li><a href="#trunkSourceJavaScriptCoretestsstresscatchclauseshouldbeundertdz3js">trunk/Source/JavaScriptCore/tests/stress/catch-clause-should-be-under-tdz3.js</a></li>

<li><a href="#trunkSourceJavaScriptCoretestsstresscatchclauseshouldbeundertdz4js">trunk/Source/JavaScriptCore/tests/stress/catch-clause-should-be-under-tdz4.js</a></li>

<li><a href="#trunkSourceJavaScriptCoretestsstresscatchclauseshouldbeundertdz5js">trunk/Source/JavaScriptCore/tests/stress/catch-clause-should-be-under-tdz5.js</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkSourceJavaScriptCoreChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (203314 => 203315)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog        2016-07-16 00:55:12 UTC (rev 203314)

+++ trunk/Source/JavaScriptCore/ChangeLog        2016-07-16 01:14:57 UTC (rev 203315)

</span><span class="lines">@@ -1,3 +1,19 @@

</span><ins>+2016-07-15  Mark Lam  &lt;mark.lam@apple.com&gt;

+

+        Assertion failures and crashes with missing TDZ checks for catch-node bindings.

+        https://bugs.webkit.org/show_bug.cgi?id=158797

+

+        Reviewed by Saam Barati.

+

+        * bytecompiler/BytecodeGenerator.cpp:

+        (JSC::BytecodeGenerator::emitPushCatchScope):

+        (JSC::BytecodeGenerator::emitPopCatchScope):

+        * tests/stress/catch-clause-should-be-under-tdz1.js: Added.

+        * tests/stress/catch-clause-should-be-under-tdz2.js: Added.

+        * tests/stress/catch-clause-should-be-under-tdz3.js: Added.

+        * tests/stress/catch-clause-should-be-under-tdz4.js: Added.

+        * tests/stress/catch-clause-should-be-under-tdz5.js: Added.

+

</ins><span class="cx"> 2016-07-15  Geoffrey Garen  &lt;ggaren@apple.com&gt;

</span><span class="cx"> 

</span><span class="cx">         Added a makeRef&lt;T&gt; helper

</span></span></pre></div>

<a id="trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorcpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp (203314 => 203315)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp        2016-07-16 00:55:12 UTC (rev 203314)

+++ trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp        2016-07-16 01:14:57 UTC (rev 203315)

</span><span class="lines">@@ -3862,7 +3862,7 @@

</span><span class="cx"> 

</span><span class="cx"> void BytecodeGenerator::emitPushCatchScope(VariableEnvironment&amp; environment)

</span><span class="cx"> {

</span><del>-    pushLexicalScopeInternal(environment, TDZCheckOptimization::Optimize, NestedScopeType::IsNotNested, nullptr, TDZRequirement::NotUnderTDZ, ScopeType::CatchScope, ScopeRegisterType::Block);

</del><ins>+    pushLexicalScopeInternal(environment, TDZCheckOptimization::Optimize, NestedScopeType::IsNotNested, nullptr, TDZRequirement::UnderTDZ, ScopeType::CatchScope, ScopeRegisterType::Block);

</ins><span class="cx"> }

</span><span class="cx"> 

</span><span class="cx"> void BytecodeGenerator::emitPopCatchScope(VariableEnvironment&amp; environment) 

</span></span></pre></div>

<a id="trunkSourceJavaScriptCoretestsstresscatchclauseshouldbeundertdz1js"></a>

<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/catch-clause-should-be-under-tdz1.js (0 => 203315)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/catch-clause-should-be-under-tdz1.js                                (rev 0)

+++ trunk/Source/JavaScriptCore/tests/stress/catch-clause-should-be-under-tdz1.js        2016-07-16 01:14:57 UTC (rev 203315)

</span><span class="lines">@@ -0,0 +1,10 @@

<ins>+// This test should not crash.

+var caughtReferenceError = false;

+try {

+    try { throw [void 0]; } catch ([{constructor} = new constructor]) { }

+} catch (e) {

+    caughtReferenceError = true;

+}

+

+if (!caughtReferenceError)

+    throw Error(&quot;Missing ReferenceError&quot;);

</ins></span></pre></div>

<a id="trunkSourceJavaScriptCoretestsstresscatchclauseshouldbeundertdz2js"></a>

<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/catch-clause-should-be-under-tdz2.js (0 => 203315)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/catch-clause-should-be-under-tdz2.js                                (rev 0)

+++ trunk/Source/JavaScriptCore/tests/stress/catch-clause-should-be-under-tdz2.js        2016-07-16 01:14:57 UTC (rev 203315)

</span><span class="lines">@@ -0,0 +1,10 @@

<ins>+// This test should not crash.

+var caughtReferenceError = false;

+try {

+    try { throw []; } catch ({c = new class extends C {}, constructor: C}) { }

+} catch (e) {

+    caughtReferenceError = true;

+}

+

+if (!caughtReferenceError)

+    throw Error(&quot;Missing ReferenceError&quot;);

</ins></span></pre></div>

<a id="trunkSourceJavaScriptCoretestsstresscatchclauseshouldbeundertdz3js"></a>

<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/catch-clause-should-be-under-tdz3.js (0 => 203315)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/catch-clause-should-be-under-tdz3.js                                (rev 0)

+++ trunk/Source/JavaScriptCore/tests/stress/catch-clause-should-be-under-tdz3.js        2016-07-16 01:14:57 UTC (rev 203315)

</span><span class="lines">@@ -0,0 +1,10 @@

<ins>+// This test should not crash.

+var caughtReferenceError = false;

+try {

+    try { throw {}; } catch ({a = (print(a), b), b}) { }

+} catch (e) {

+    caughtReferenceError = true;

+}

+

+if (!caughtReferenceError)

+    throw Error(&quot;Missing ReferenceError&quot;);

</ins></span></pre></div>

<a id="trunkSourceJavaScriptCoretestsstresscatchclauseshouldbeundertdz4js"></a>

<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/catch-clause-should-be-under-tdz4.js (0 => 203315)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/catch-clause-should-be-under-tdz4.js                                (rev 0)

+++ trunk/Source/JavaScriptCore/tests/stress/catch-clause-should-be-under-tdz4.js        2016-07-16 01:14:57 UTC (rev 203315)

</span><span class="lines">@@ -0,0 +1,11 @@

<ins>+// This test should not crash.

+var caughtReferenceError = false;

+try {

+    function* m(){ try {throw [void 0]} catch ([c = (yield c)]) {} }

+    [...m()]

+} catch (e) {

+    caughtReferenceError = true;

+}

+

+if (!caughtReferenceError)

+    throw Error(&quot;Missing ReferenceError&quot;);

</ins></span></pre></div>

<a id="trunkSourceJavaScriptCoretestsstresscatchclauseshouldbeundertdz5js"></a>

<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/catch-clause-should-be-under-tdz5.js (0 => 203315)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/catch-clause-should-be-under-tdz5.js                                (rev 0)

+++ trunk/Source/JavaScriptCore/tests/stress/catch-clause-should-be-under-tdz5.js        2016-07-16 01:14:57 UTC (rev 203315)

</span><span class="lines">@@ -0,0 +1,10 @@

<ins>+// This test should not crash.

+var caughtReferenceError = false;

+try {

+    while(1) try {throw {}} catch({a=({}={__proto__}), __proto__}){}

+} catch (e) {

+    caughtReferenceError = true;

+}

+

+if (!caughtReferenceError)

+    throw Error(&quot;Missing ReferenceError&quot;);

</ins></span></pre>

</div>

</div>

</body>

</html>