<!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>[236169] releases/WebKitGTK/webkit-2.22</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/236169">236169</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2018-09-19 05:33:25 -0700 (Wed, 19 Sep 2018)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/235712">r235712</a> - [ESNext] Symbol.prototype.description
https://bugs.webkit.org/show_bug.cgi?id=186686

Reviewed by Keith Miller.

JSTests:

* stress/symbol-description.js:
Add tests for empty and null symbol cases.

* test262/config.yaml:
Enable Symbol.prototype.description tests.

Source/JavaScriptCore:

Symbol.prototype.description was implemented in <a href="http://trac.webkit.org/projects/webkit/changeset/232404">r232404</a>, but has one small bug:
It should return undefined for a null symbol.

* runtime/Symbol.cpp:
(JSC::Symbol::description const):
* runtime/SymbolPrototype.cpp:
(JSC::symbolProtoGetterDescription):
Address the null symbol case.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit222JSTestsChangeLog">releases/WebKitGTK/webkit-2.22/JSTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit222JSTestsstresssymboldescriptionjs">releases/WebKitGTK/webkit-2.22/JSTests/stress/symbol-description.js</a></li>
<li><a href="#releasesWebKitGTKwebkit222JSTeststest262configyaml">releases/WebKitGTK/webkit-2.22/JSTests/test262/config.yaml</a></li>
<li><a href="#releasesWebKitGTKwebkit222SourceJavaScriptCoreChangeLog">releases/WebKitGTK/webkit-2.22/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit222SourceJavaScriptCoreruntimeSymbolcpp">releases/WebKitGTK/webkit-2.22/Source/JavaScriptCore/runtime/Symbol.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit222SourceJavaScriptCoreruntimeSymbolPrototypecpp">releases/WebKitGTK/webkit-2.22/Source/JavaScriptCore/runtime/SymbolPrototype.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit222JSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/JSTests/ChangeLog (236168 => 236169)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/JSTests/ChangeLog 2018-09-19 12:33:18 UTC (rev 236168)
+++ releases/WebKitGTK/webkit-2.22/JSTests/ChangeLog    2018-09-19 12:33:25 UTC (rev 236169)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2018-09-05  Ross Kirsling  <ross.kirsling@sony.com>
+
+        [ESNext] Symbol.prototype.description
+        https://bugs.webkit.org/show_bug.cgi?id=186686
+
+        Reviewed by Keith Miller.
+
+        * stress/symbol-description.js:
+        Add tests for empty and null symbol cases.
+
+        * test262/config.yaml:
+        Enable Symbol.prototype.description tests.
+
</ins><span class="cx"> 2018-09-05  Mark Lam  <mark.lam@apple.com>
</span><span class="cx"> 
</span><span class="cx">         isAsyncGeneratorMethodParseMode() should check for SourceParseMode::AsyncGeneratorWrapperMethodMode.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222JSTestsstresssymboldescriptionjs"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/JSTests/stress/symbol-description.js (236168 => 236169)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/JSTests/stress/symbol-description.js      2018-09-19 12:33:18 UTC (rev 236168)
+++ releases/WebKitGTK/webkit-2.22/JSTests/stress/symbol-description.js 2018-09-19 12:33:25 UTC (rev 236169)
</span><span class="lines">@@ -20,19 +20,31 @@
</span><span class="cx"> 
</span><span class="cx"> var s0 = Symbol("Cocoa");
</span><span class="cx"> var s1 = Symbol("Cappuccino");
</span><ins>+var s2 = Symbol("");
+var s3 = Symbol();
</ins><span class="cx"> 
</span><span class="cx"> shouldBe(s0.description, "Cocoa");
</span><span class="cx"> shouldBe(s0.toString(), "Symbol(Cocoa)");
</span><span class="cx"> shouldBe(s1.description, "Cappuccino");
</span><span class="cx"> shouldBe(s1.toString(), "Symbol(Cappuccino)");
</span><ins>+shouldBe(s2.description, "");
+shouldBe(s2.toString(), "Symbol()");
+shouldBe(s3.description, undefined);
+shouldBe(s3.toString(), "Symbol()");
</ins><span class="cx"> 
</span><span class="cx"> var o0 = Object(s0);
</span><span class="cx"> var o1 = Object(s1);
</span><ins>+var o2 = Object(s2);
+var o3 = Object(s3);
</ins><span class="cx"> 
</span><span class="cx"> shouldBe(o0.description, "Cocoa");
</span><span class="cx"> shouldBe(o0.toString(), "Symbol(Cocoa)");
</span><span class="cx"> shouldBe(o1.description, "Cappuccino");
</span><span class="cx"> shouldBe(o1.toString(), "Symbol(Cappuccino)");
</span><ins>+shouldBe(o2.description, "");
+shouldBe(o2.toString(), "Symbol()");
+shouldBe(o3.description, undefined);
+shouldBe(o3.toString(), "Symbol()");
</ins><span class="cx"> 
</span><span class="cx"> var descriptor = Object.getOwnPropertyDescriptor(Symbol.prototype, "description");
</span><span class="cx"> shouldBe(descriptor.enumerable, false);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222JSTeststest262configyaml"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/JSTests/test262/config.yaml (236168 => 236169)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/JSTests/test262/config.yaml       2018-09-19 12:33:18 UTC (rev 236168)
+++ releases/WebKitGTK/webkit-2.22/JSTests/test262/config.yaml  2018-09-19 12:33:25 UTC (rev 236169)
</span><span class="lines">@@ -11,8 +11,6 @@
</span><span class="cx">     - BigInt
</span><span class="cx">     # https://bugs.webkit.org/show_bug.cgi?id=166693
</span><span class="cx">     - async-iteration
</span><del>-    # https://bugs.webkit.org/show_bug.cgi?id=186686
-    - Symbol.prototype.description
</del><span class="cx">     # https://bugs.webkit.org/show_bug.cgi?id=186694
</span><span class="cx">     - String.prototype.matchAll
</span><span class="cx">     - Symbol.matchAll
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222SourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/JavaScriptCore/ChangeLog (236168 => 236169)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/JavaScriptCore/ChangeLog   2018-09-19 12:33:18 UTC (rev 236168)
+++ releases/WebKitGTK/webkit-2.22/Source/JavaScriptCore/ChangeLog      2018-09-19 12:33:25 UTC (rev 236169)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2018-09-05  Ross Kirsling  <ross.kirsling@sony.com>
+
+        [ESNext] Symbol.prototype.description
+        https://bugs.webkit.org/show_bug.cgi?id=186686
+
+        Reviewed by Keith Miller.
+
+        Symbol.prototype.description was implemented in r232404, but has one small bug:
+        It should return undefined for a null symbol.
+
+        * runtime/Symbol.cpp:
+        (JSC::Symbol::description const):
+        * runtime/SymbolPrototype.cpp:
+        (JSC::symbolProtoGetterDescription):
+        Address the null symbol case.
+
</ins><span class="cx"> 2018-09-04  Keith Miller  <keith_miller@apple.com>
</span><span class="cx"> 
</span><span class="cx">         RELEASE_ASSERT at ../../Source/JavaScriptCore/heap/MarkedSpace.h:83
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222SourceJavaScriptCoreruntimeSymbolcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/JavaScriptCore/runtime/Symbol.cpp (236168 => 236169)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/JavaScriptCore/runtime/Symbol.cpp  2018-09-19 12:33:18 UTC (rev 236168)
+++ releases/WebKitGTK/webkit-2.22/Source/JavaScriptCore/runtime/Symbol.cpp     2018-09-19 12:33:25 UTC (rev 236169)
</span><span class="lines">@@ -105,7 +105,8 @@
</span><span class="cx"> 
</span><span class="cx"> String Symbol::description() const
</span><span class="cx"> {
</span><del>-    return privateName().uid();
</del><ins>+    auto& uid = privateName().uid();
+    return uid.isNullSymbol() ? String() : uid;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> Symbol* Symbol::create(VM& vm)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222SourceJavaScriptCoreruntimeSymbolPrototypecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/JavaScriptCore/runtime/SymbolPrototype.cpp (236168 => 236169)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/JavaScriptCore/runtime/SymbolPrototype.cpp 2018-09-19 12:33:18 UTC (rev 236168)
+++ releases/WebKitGTK/webkit-2.22/Source/JavaScriptCore/runtime/SymbolPrototype.cpp    2018-09-19 12:33:25 UTC (rev 236169)
</span><span class="lines">@@ -97,7 +97,8 @@
</span><span class="cx">     if (!symbol)
</span><span class="cx">         return throwVMTypeError(exec, scope, SymbolDescriptionTypeError);
</span><span class="cx">     scope.release();
</span><del>-    return JSValue::encode(jsString(&vm, symbol->description()));
</del><ins>+    const auto description = symbol->description();
+    return JSValue::encode(description.isNull() ? jsUndefined() : jsString(&vm, description));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL symbolProtoFuncToString(ExecState* exec)
</span></span></pre>
</div>
</div>

</body>
</html>