<!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>[214154] branches/safari-603-branch</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/214154">214154</a></dd>
<dt>Author</dt> <dd>jmarcell@apple.com</dd>
<dt>Date</dt> <dd>2017-03-19 18:32:07 -0700 (Sun, 19 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/213742">r213742</a>. rdar://problem/30921818</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari603branchJSTestsChangeLog">branches/safari-603-branch/JSTests/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceJavaScriptCoreChangeLog">branches/safari-603-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceJavaScriptCorebytecompilerNodesCodegencpp">branches/safari-603-branch/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari603branchJSTestsstressregress168546js">branches/safari-603-branch/JSTests/stress/regress-168546.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari603branchJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/JSTests/ChangeLog (214153 => 214154)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/JSTests/ChangeLog 2017-03-20 01:32:04 UTC (rev 214153)
+++ branches/safari-603-branch/JSTests/ChangeLog 2017-03-20 01:32:07 UTC (rev 214154)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2017-03-16 Jason Marcell <jmarcell@apple.com>
+
+ Merge r213742. rdar://problem/30921818
+
+ 2017-03-10 Mark Lam <mark.lam@apple.com>
+
+ JSC: BindingNode::bindValue doesn't increase the scope's reference count.
+ https://bugs.webkit.org/show_bug.cgi?id=168546
+ <rdar://problem/30589551>
+
+ Reviewed by Saam Barati.
+
+ * stress/regress-168546.js: Added.
+
</ins><span class="cx"> 2017-02-17 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r212177. rdar://problem/30205880
</span></span></pre></div>
<a id="branchessafari603branchJSTestsstressregress168546js"></a>
<div class="addfile"><h4>Added: branches/safari-603-branch/JSTests/stress/regress-168546.js (0 => 214154)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/JSTests/stress/regress-168546.js (rev 0)
+++ branches/safari-603-branch/JSTests/stress/regress-168546.js 2017-03-20 01:32:07 UTC (rev 214154)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+// This test passes if it does not crash.
+try {
+ (function () {
+ let a = {
+ get val() {
+ [...{a = 1.45}] = [];
+ a.val.x;
+ },
+ };
+
+ a.val;
+ })();
+} catch (e) {
+}
</ins></span></pre></div>
<a id="branchessafari603branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/JavaScriptCore/ChangeLog (214153 => 214154)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/JavaScriptCore/ChangeLog 2017-03-20 01:32:04 UTC (rev 214153)
+++ branches/safari-603-branch/Source/JavaScriptCore/ChangeLog 2017-03-20 01:32:07 UTC (rev 214154)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2017-03-16 Jason Marcell <jmarcell@apple.com>
</span><span class="cx">
</span><ins>+ Merge r213742. rdar://problem/30921818
+
+ 2017-03-10 Mark Lam <mark.lam@apple.com>
+
+ JSC: BindingNode::bindValue doesn't increase the scope's reference count.
+ https://bugs.webkit.org/show_bug.cgi?id=168546
+ <rdar://problem/30589551>
+
+ Reviewed by Saam Barati.
+
+ We should protect the scope RegisterID with a RefPtr while it is still needed.
+
+ * bytecompiler/NodesCodegen.cpp:
+ (JSC::ForInNode::emitLoopHeader):
+ (JSC::ForOfNode::emitBytecode):
+ (JSC::BindingNode::bindValue):
+
+2017-03-16 Jason Marcell <jmarcell@apple.com>
+
</ins><span class="cx"> Merge r213648. rdar://problem/30921824
</span><span class="cx">
</span><span class="cx"> 2017-03-09 Filip Pizlo <fpizlo@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchSourceJavaScriptCorebytecompilerNodesCodegencpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp (214153 => 214154)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp 2017-03-20 01:32:04 UTC (rev 214153)
+++ branches/safari-603-branch/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp 2017-03-20 01:32:07 UTC (rev 214154)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 1999-2002 Harri Porten (porten@kde.org)
</span><span class="cx"> * Copyright (C) 2001 Peter Kelly (pmk@post.com)
</span><del>-* Copyright (C) 2003-2009, 2012-2013, 2015-2016 Apple Inc. All rights reserved.
</del><ins>+* Copyright (C) 2003-2017 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2007 Cameron Zwarich (cwzwarich@uwaterloo.ca)
</span><span class="cx"> * Copyright (C) 2007 Maks Orlovich
</span><span class="cx"> * Copyright (C) 2007 Eric Seidel <eric@webkit.org>
</span><span class="lines">@@ -2689,9 +2689,9 @@
</span><span class="cx"> generator.emitExpressionInfo(divot(), divotStart(), divotEnd());
</span><span class="cx"> if (var.isReadOnly())
</span><span class="cx"> generator.emitReadOnlyExceptionIfNeeded(var);
</span><del>- RegisterID* scope = generator.emitResolveScope(nullptr, var);
</del><ins>+ RefPtr<RegisterID> scope = generator.emitResolveScope(nullptr, var);
</ins><span class="cx"> generator.emitExpressionInfo(divot(), divotStart(), divotEnd());
</span><del>- generator.emitPutToScope(scope, var, propertyName, generator.isStrictMode() ? ThrowIfNotFound : DoNotThrowIfNotFound, InitializationMode::NotInitialization);
</del><ins>+ generator.emitPutToScope(scope.get(), var, propertyName, generator.isStrictMode() ? ThrowIfNotFound : DoNotThrowIfNotFound, InitializationMode::NotInitialization);
</ins><span class="cx"> }
</span><span class="cx"> generator.emitProfileType(propertyName, var, m_lexpr->position(), JSTextPosition(-1, m_lexpr->position().offset + ident.length(), -1));
</span><span class="cx"> };
</span><span class="lines">@@ -2935,9 +2935,9 @@
</span><span class="cx"> generator.emitExpressionInfo(divot(), divotStart(), divotEnd());
</span><span class="cx"> if (var.isReadOnly())
</span><span class="cx"> generator.emitReadOnlyExceptionIfNeeded(var);
</span><del>- RegisterID* scope = generator.emitResolveScope(nullptr, var);
</del><ins>+ RefPtr<RegisterID> scope = generator.emitResolveScope(nullptr, var);
</ins><span class="cx"> generator.emitExpressionInfo(divot(), divotStart(), divotEnd());
</span><del>- generator.emitPutToScope(scope, var, value, generator.isStrictMode() ? ThrowIfNotFound : DoNotThrowIfNotFound, InitializationMode::NotInitialization);
</del><ins>+ generator.emitPutToScope(scope.get(), var, value, generator.isStrictMode() ? ThrowIfNotFound : DoNotThrowIfNotFound, InitializationMode::NotInitialization);
</ins><span class="cx"> }
</span><span class="cx"> generator.emitProfileType(value, var, m_lexpr->position(), JSTextPosition(-1, m_lexpr->position().offset + ident.length(), -1));
</span><span class="cx"> } else if (m_lexpr->isDotAccessorNode()) {
</span><span class="lines">@@ -4010,15 +4010,15 @@
</span><span class="cx"> }
</span><span class="cx"> if (generator.isStrictMode())
</span><span class="cx"> generator.emitExpressionInfo(divotEnd(), divotStart(), divotEnd());
</span><del>- RegisterID* scope = generator.emitResolveScope(nullptr, var);
</del><ins>+ RefPtr<RegisterID> scope = generator.emitResolveScope(nullptr, var);
</ins><span class="cx"> generator.emitExpressionInfo(divotEnd(), divotStart(), divotEnd());
</span><span class="cx"> if (m_bindingContext == AssignmentContext::AssignmentExpression)
</span><del>- generator.emitTDZCheckIfNecessary(var, nullptr, scope);
</del><ins>+ generator.emitTDZCheckIfNecessary(var, nullptr, scope.get());
</ins><span class="cx"> if (isReadOnly) {
</span><span class="cx"> generator.emitReadOnlyExceptionIfNeeded(var);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- generator.emitPutToScope(scope, var, value, generator.isStrictMode() ? ThrowIfNotFound : DoNotThrowIfNotFound, initializationModeForAssignmentContext(m_bindingContext));
</del><ins>+ generator.emitPutToScope(scope.get(), var, value, generator.isStrictMode() ? ThrowIfNotFound : DoNotThrowIfNotFound, initializationModeForAssignmentContext(m_bindingContext));
</ins><span class="cx"> generator.emitProfileType(value, var, divotStart(), divotEnd());
</span><span class="cx"> if (m_bindingContext == AssignmentContext::DeclarationStatement || m_bindingContext == AssignmentContext::ConstDeclarationStatement)
</span><span class="cx"> generator.liftTDZCheckIfPossible(var);
</span></span></pre>
</div>
</div>
</body>
</html>