<!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>[201293] 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/201293">201293</a></dd>
<dt>Author</dt> <dd>sbarati@apple.com</dd>
<dt>Date</dt> <dd>2016-05-23 13:27:28 -0700 (Mon, 23 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>String template don't handle let initialization properly inside eval
https://bugs.webkit.org/show_bug.cgi?id=157991
Reviewed by Oliver Hunt.
The fix is to make sure we emit TDZ checks.
* bytecompiler/NodesCodegen.cpp:
(JSC::TaggedTemplateNode::emitBytecode):
* tests/stress/tagged-template-tdz.js: Added.
(shouldThrowTDZ):
(test):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecompilerNodesCodegencpp">trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoretestsstresstaggedtemplatetdzjs">trunk/Source/JavaScriptCore/tests/stress/tagged-template-tdz.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (201292 => 201293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-05-23 20:25:03 UTC (rev 201292)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-05-23 20:27:28 UTC (rev 201293)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-05-23 Saam barati <sbarati@apple.com>
+
+ String template don't handle let initialization properly inside eval
+ https://bugs.webkit.org/show_bug.cgi?id=157991
+
+ Reviewed by Oliver Hunt.
+
+ The fix is to make sure we emit TDZ checks.
+
+ * bytecompiler/NodesCodegen.cpp:
+ (JSC::TaggedTemplateNode::emitBytecode):
+ * tests/stress/tagged-template-tdz.js: Added.
+ (shouldThrowTDZ):
+ (test):
+
</ins><span class="cx"> 2016-05-22 Saam barati <sbarati@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed. Fixed debug assertion failures from r201235.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecompilerNodesCodegencpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp (201292 => 201293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp 2016-05-23 20:25:03 UTC (rev 201292)
+++ trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp 2016-05-23 20:27:28 UTC (rev 201293)
</span><span class="lines">@@ -292,9 +292,10 @@
</span><span class="cx"> expectedFunction = generator.expectedFunctionForIdentifier(identifier);
</span><span class="cx">
</span><span class="cx"> Variable var = generator.variable(identifier);
</span><del>- if (RegisterID* local = var.local())
</del><ins>+ if (RegisterID* local = var.local()) {
+ generator.emitTDZCheckIfNecessary(var, local, nullptr);
</ins><span class="cx"> tag = generator.emitMove(generator.newTemporary(), local);
</span><del>- else {
</del><ins>+ } else {
</ins><span class="cx"> tag = generator.newTemporary();
</span><span class="cx"> base = generator.newTemporary();
</span><span class="cx">
</span><span class="lines">@@ -302,6 +303,7 @@
</span><span class="cx"> generator.emitExpressionInfo(newDivot, divotStart(), newDivot);
</span><span class="cx"> generator.moveToDestinationIfNeeded(base.get(), generator.emitResolveScope(base.get(), var));
</span><span class="cx"> generator.emitGetFromScope(tag.get(), base.get(), var, ThrowIfNotFound);
</span><ins>+ generator.emitTDZCheckIfNecessary(var, tag.get(), nullptr);
</ins><span class="cx"> }
</span><span class="cx"> } else if (m_tag->isBracketAccessorNode()) {
</span><span class="cx"> BracketAccessorNode* bracket = static_cast<BracketAccessorNode*>(m_tag);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstresstaggedtemplatetdzjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/tagged-template-tdz.js (0 => 201293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/tagged-template-tdz.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/tagged-template-tdz.js 2016-05-23 20:27:28 UTC (rev 201293)
</span><span class="lines">@@ -0,0 +1,51 @@
</span><ins>+function shouldThrowTDZ(func) {
+ let hasThrown = false;
+ try {
+ func();
+ } catch(e) {
+ if (e.name.indexOf("ReferenceError") !== -1)
+ hasThrown = true;
+ }
+ if (!hasThrown)
+ throw new Error("Did not throw TDZ error");
+}
+noInline(shouldThrowTDZ);
+
+function test(f) {
+ for (let i = 0; i < 1000; i++)
+ f();
+}
+
+test(function() {
+ shouldThrowTDZ(function() {
+ (a)``;
+ let a;
+ });
+});
+
+test(function() {
+ shouldThrowTDZ(function() {
+ (a)``;
+ let a;
+ function capture() { return a; }
+ });
+});
+
+test(function() {
+ shouldThrowTDZ(()=> { (a)``; });
+ let a;
+});
+
+test(function() {
+ shouldThrowTDZ(()=> { eval("(a)``"); });
+ let a;
+});
+
+
+test(function() {
+ shouldThrowTDZ(()=> { (globalLet)``; });
+});
+test(function() {
+ shouldThrowTDZ(()=> { eval("(globalLet)``;")});
+});
+let globalLet;
</ins></span></pre>
</div>
</div>
</body>
</html>