<!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>[184507] branches/safari-601.1.32-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/184507">184507</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-05-18 12:35:03 -0700 (Mon, 18 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/183912">r183912</a>. rdar://problem/20926150</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601132branchLayoutTestsChangeLog">branches/safari-601.1.32-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601132branchLayoutTestsjsclasssyntaxstringandnumericnamesexpectedtxt">branches/safari-601.1.32-branch/LayoutTests/js/class-syntax-string-and-numeric-names-expected.txt</a></li>
<li><a href="#branchessafari601132branchLayoutTestsjsscripttestsclasssyntaxstringandnumericnamesjs">branches/safari-601.1.32-branch/LayoutTests/js/script-tests/class-syntax-string-and-numeric-names.js</a></li>
<li><a href="#branchessafari601132branchSourceJavaScriptCoreChangeLog">branches/safari-601.1.32-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari601132branchSourceJavaScriptCoreparserParsercpp">branches/safari-601.1.32-branch/Source/JavaScriptCore/parser/Parser.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601132branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/LayoutTests/ChangeLog (184506 => 184507)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/LayoutTests/ChangeLog 2015-05-18 19:24:42 UTC (rev 184506)
+++ branches/safari-601.1.32-branch/LayoutTests/ChangeLog 2015-05-18 19:35:03 UTC (rev 184507)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2015-05-18 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r183912. rdar://problem/20926150
+
+ 2015-05-06 Ryosuke Niwa <rniwa@webkit.org>
+
+ ToT WebKit crashes while loading ES6 compatibility table
+ https://bugs.webkit.org/show_bug.cgi?id=144726
+
+ Reviewed by Filip Pizlo.
+
+ Added new test cases.
+
+ * js/class-syntax-string-and-numeric-names-expected.txt:
+ * js/script-tests/class-syntax-string-and-numeric-names.js:
+
+2015-05-18 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r184353. rdar://problem/20809399
</span><span class="cx">
</span><span class="cx"> 2015-05-14 Myles C. Maxfield <mmaxfield@apple.com>
</span></span></pre></div>
<a id="branchessafari601132branchLayoutTestsjsclasssyntaxstringandnumericnamesexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/LayoutTests/js/class-syntax-string-and-numeric-names-expected.txt (184506 => 184507)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/LayoutTests/js/class-syntax-string-and-numeric-names-expected.txt 2015-05-18 19:24:42 UTC (rev 184506)
+++ branches/safari-601.1.32-branch/LayoutTests/js/class-syntax-string-and-numeric-names-expected.txt 2015-05-18 19:35:03 UTC (rev 184507)
</span><span class="lines">@@ -40,6 +40,8 @@
</span><span class="cx"> PASS (new X)[6] is undefined
</span><span class="cx"> PASS setterValue = 0; X = class { static set 7(x) { setterValue = x } static get 7() { } }; X[7] = 27; setterValue is 27
</span><span class="cx"> PASS (new X)[7] = 28; setterValue is 27
</span><ins>+PASS function x() { return class { 'foo bar'() { return 29; } } }; (new (x()))['foo bar']() is 29
+PASS function x() { return class { 30() { return 30; } } }; (new (x()))[30]() is 30
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="branchessafari601132branchLayoutTestsjsscripttestsclasssyntaxstringandnumericnamesjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/LayoutTests/js/script-tests/class-syntax-string-and-numeric-names.js (184506 => 184507)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/LayoutTests/js/script-tests/class-syntax-string-and-numeric-names.js 2015-05-18 19:24:42 UTC (rev 184506)
+++ branches/safari-601.1.32-branch/LayoutTests/js/script-tests/class-syntax-string-and-numeric-names.js 2015-05-18 19:35:03 UTC (rev 184507)
</span><span class="lines">@@ -51,3 +51,6 @@
</span><span class="cx"> shouldBe("(new X)[6]", "undefined");
</span><span class="cx"> shouldBe("setterValue = 0; X = class { static set 7(x) { setterValue = x } static get 7() { } }; X[7] = 27; setterValue", "27");
</span><span class="cx"> shouldBe("(new X)[7] = 28; setterValue", "27");
</span><ins>+
+shouldBe("function x() { return class { 'foo bar'() { return 29; } } }; (new (x()))['foo bar']()", "29");
+shouldBe("function x() { return class { 30() { return 30; } } }; (new (x()))[30]()", "30");
</ins></span></pre></div>
<a id="branchessafari601132branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/JavaScriptCore/ChangeLog (184506 => 184507)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/JavaScriptCore/ChangeLog 2015-05-18 19:24:42 UTC (rev 184506)
+++ branches/safari-601.1.32-branch/Source/JavaScriptCore/ChangeLog 2015-05-18 19:35:03 UTC (rev 184507)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-05-18 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r183912. rdar://problem/20926150
+
+ 2015-05-06 Ryosuke Niwa <rniwa@webkit.org>
+
+ ToT WebKit crashes while loading ES6 compatibility table
+ https://bugs.webkit.org/show_bug.cgi?id=144726
+
+ Reviewed by Filip Pizlo.
+
+ The bug was caused by parseClass superfluously avoiding to build up the string after seeing {.
+
+ Always build the identifier here as it could be a method name.
+
+ * parser/Parser.cpp:
+ (JSC::Parser<LexerType>::parseClass):
+
</ins><span class="cx"> 2015-05-12 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r184137. rdar://problem/20707307
</span></span></pre></div>
<a id="branchessafari601132branchSourceJavaScriptCoreparserParsercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/JavaScriptCore/parser/Parser.cpp (184506 => 184507)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/JavaScriptCore/parser/Parser.cpp 2015-05-18 19:24:42 UTC (rev 184506)
+++ branches/safari-601.1.32-branch/Source/JavaScriptCore/parser/Parser.cpp 2015-05-18 19:35:03 UTC (rev 184507)
</span><span class="lines">@@ -1529,7 +1529,7 @@
</span><span class="cx"> }
</span><span class="cx"> const ConstructorKind constructorKind = parentClass ? ConstructorKind::Derived : ConstructorKind::Base;
</span><span class="cx">
</span><del>- consumeOrFailWithFlags(OPENBRACE, TreeBuilder::DontBuildStrings, "Expected opening '{' at the start of a class body");
</del><ins>+ consumeOrFail(OPENBRACE, "Expected opening '{' at the start of a class body");
</ins><span class="cx">
</span><span class="cx"> TreeExpression constructor = 0;
</span><span class="cx"> TreePropertyList staticMethods = 0;
</span><span class="lines">@@ -1558,16 +1558,19 @@
</span><span class="cx"> switch (m_token.m_type) {
</span><span class="cx"> case STRING:
</span><span class="cx"> ident = m_token.m_data.ident;
</span><ins>+ ASSERT(ident);
</ins><span class="cx"> next();
</span><span class="cx"> break;
</span><span class="cx"> case IDENT:
</span><span class="cx"> ident = m_token.m_data.ident;
</span><span class="cx"> isGetter = *ident == propertyNames.get;
</span><span class="cx"> isSetter = *ident == propertyNames.set;
</span><ins>+ ASSERT(ident);
</ins><span class="cx"> break;
</span><span class="cx"> case DOUBLE:
</span><span class="cx"> case INTEGER:
</span><span class="cx"> ident = &m_parserArena.identifierArena().makeNumericIdentifier(const_cast<VM*>(m_vm), m_token.m_data.doubleValue);
</span><ins>+ ASSERT(ident);
</ins><span class="cx"> next();
</span><span class="cx"> break;
</span><span class="cx"> default:
</span></span></pre>
</div>
</div>
</body>
</html>