<!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>[206738] trunk</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/206738">206738</a></dd>
<dt>Author</dt> <dd>utatane.tea@gmail.com</dd>
<dt>Date</dt> <dd>2016-10-03 11:36:12 -0700 (Mon, 03 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[ES6] GeneratorFunction (a.k.a. GeneratorWrapperFunction)'s prototype object does not have constructor property
https://bugs.webkit.org/show_bug.cgi?id=162849
Reviewed by Geoffrey Garen.
JSTests:
* test262.yaml:
Source/JavaScriptCore:
Since GeneratorFunction is not constructible, GeneratorFunction.prototype does not have "constructor" property.
function* generatorFunction() { }
generatorFunction.prototype.constructor // undefined
* runtime/JSFunction.cpp:
(JSC::JSFunction::getOwnPropertySlot):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkJSTestsChangeLog">trunk/JSTests/ChangeLog</a></li>
<li><a href="#trunkJSTeststest262yaml">trunk/JSTests/test262.yaml</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSFunctioncpp">trunk/Source/JavaScriptCore/runtime/JSFunction.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/ChangeLog (206737 => 206738)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/ChangeLog 2016-10-03 17:57:27 UTC (rev 206737)
+++ trunk/JSTests/ChangeLog 2016-10-03 18:36:12 UTC (rev 206738)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-10-03 Yusuke Suzuki <utatane.tea@gmail.com>
+
+ [ES6] GeneratorFunction (a.k.a. GeneratorWrapperFunction)'s prototype object does not have constructor property
+ https://bugs.webkit.org/show_bug.cgi?id=162849
+
+ Reviewed by Geoffrey Garen.
+
+ * test262.yaml:
+
</ins><span class="cx"> 2016-10-01 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> [ES6] Align attributes of Generator related properties to spec
</span></span></pre></div>
<a id="trunkJSTeststest262yaml"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/test262.yaml (206737 => 206738)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/test262.yaml 2016-10-03 17:57:27 UTC (rev 206737)
+++ trunk/JSTests/test262.yaml 2016-10-03 18:36:12 UTC (rev 206738)
</span><span class="lines">@@ -63034,9 +63034,9 @@
</span><span class="cx"> - path: test262/test/language/expressions/generators/params-trailing-comma.js
</span><span class="cx"> cmd: runTest262 :normal, "NoException", ["../../../../harness/assert.js", "../../../../harness/sta.js"], [:strict]
</span><span class="cx"> - path: test262/test/language/expressions/generators/prototype-own-properties.js
</span><del>- cmd: runTest262 :fail, "NoException", ["../../../../harness/assert.js", "../../../../harness/sta.js"], []
</del><ins>+ cmd: runTest262 :normal, "NoException", ["../../../../harness/assert.js", "../../../../harness/sta.js"], []
</ins><span class="cx"> - path: test262/test/language/expressions/generators/prototype-own-properties.js
</span><del>- cmd: runTest262 :fail, "NoException", ["../../../../harness/assert.js", "../../../../harness/sta.js"], [:strict]
</del><ins>+ cmd: runTest262 :normal, "NoException", ["../../../../harness/assert.js", "../../../../harness/sta.js"], [:strict]
</ins><span class="cx"> - path: test262/test/language/expressions/generators/prototype-property-descriptor.js
</span><span class="cx"> cmd: runTest262 :normal, "NoException", ["../../../../harness/assert.js", "../../../../harness/sta.js", "../../../../harness/propertyHelper.js"], []
</span><span class="cx"> - path: test262/test/language/expressions/generators/prototype-property-descriptor.js
</span><span class="lines">@@ -76522,9 +76522,9 @@
</span><span class="cx"> - path: test262/test/language/statements/class/subclass/builtin-objects/GeneratorFunction/instance-name.js
</span><span class="cx"> cmd: runTest262 :normal, "NoException", ["../../../../../../../harness/assert.js", "../../../../../../../harness/sta.js", "../../../../../../../harness/propertyHelper.js"], [:strict]
</span><span class="cx"> - path: test262/test/language/statements/class/subclass/builtin-objects/GeneratorFunction/instance-prototype.js
</span><del>- cmd: runTest262 :fail, "NoException", ["../../../../../../../harness/assert.js", "../../../../../../../harness/sta.js", "../../../../../../../harness/propertyHelper.js"], []
</del><ins>+ cmd: runTest262 :normal, "NoException", ["../../../../../../../harness/assert.js", "../../../../../../../harness/sta.js", "../../../../../../../harness/propertyHelper.js"], []
</ins><span class="cx"> - path: test262/test/language/statements/class/subclass/builtin-objects/GeneratorFunction/instance-prototype.js
</span><del>- cmd: runTest262 :fail, "NoException", ["../../../../../../../harness/assert.js", "../../../../../../../harness/sta.js", "../../../../../../../harness/propertyHelper.js"], [:strict]
</del><ins>+ cmd: runTest262 :normal, "NoException", ["../../../../../../../harness/assert.js", "../../../../../../../harness/sta.js", "../../../../../../../harness/propertyHelper.js"], [:strict]
</ins><span class="cx"> - path: test262/test/language/statements/class/subclass/builtin-objects/GeneratorFunction/regular-subclassing.js
</span><span class="cx"> cmd: runTest262 :normal, "NoException", ["../../../../../../../harness/assert.js", "../../../../../../../harness/sta.js"], []
</span><span class="cx"> - path: test262/test/language/statements/class/subclass/builtin-objects/GeneratorFunction/regular-subclassing.js
</span><span class="lines">@@ -84194,9 +84194,9 @@
</span><span class="cx"> - path: test262/test/language/statements/generators/params-trailing-comma.js
</span><span class="cx"> cmd: runTest262 :normal, "NoException", ["../../../../harness/assert.js", "../../../../harness/sta.js"], [:strict]
</span><span class="cx"> - path: test262/test/language/statements/generators/prototype-own-properties.js
</span><del>- cmd: runTest262 :fail, "NoException", ["../../../../harness/assert.js", "../../../../harness/sta.js"], []
</del><ins>+ cmd: runTest262 :normal, "NoException", ["../../../../harness/assert.js", "../../../../harness/sta.js"], []
</ins><span class="cx"> - path: test262/test/language/statements/generators/prototype-own-properties.js
</span><del>- cmd: runTest262 :fail, "NoException", ["../../../../harness/assert.js", "../../../../harness/sta.js"], [:strict]
</del><ins>+ cmd: runTest262 :normal, "NoException", ["../../../../harness/assert.js", "../../../../harness/sta.js"], [:strict]
</ins><span class="cx"> - path: test262/test/language/statements/generators/prototype-property-descriptor.js
</span><span class="cx"> cmd: runTest262 :normal, "NoException", ["../../../../harness/assert.js", "../../../../harness/sta.js", "../../../../harness/propertyHelper.js"], []
</span><span class="cx"> - path: test262/test/language/statements/generators/prototype-property-descriptor.js
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (206737 => 206738)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-10-03 17:57:27 UTC (rev 206737)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-10-03 18:36:12 UTC (rev 206738)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-10-03 Yusuke Suzuki <utatane.tea@gmail.com>
+
+ [ES6] GeneratorFunction (a.k.a. GeneratorWrapperFunction)'s prototype object does not have constructor property
+ https://bugs.webkit.org/show_bug.cgi?id=162849
+
+ Reviewed by Geoffrey Garen.
+
+ Since GeneratorFunction is not constructible, GeneratorFunction.prototype does not have "constructor" property.
+
+ function* generatorFunction() { }
+ generatorFunction.prototype.constructor // undefined
+
+ * runtime/JSFunction.cpp:
+ (JSC::JSFunction::getOwnPropertySlot):
+
</ins><span class="cx"> 2016-10-03 Nicolas Breidinger <Nicolas.Breidinger@sony.com>
</span><span class="cx">
</span><span class="cx"> JSStringRef should define JSChar without platform checks
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSFunctioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSFunction.cpp (206737 => 206738)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSFunction.cpp 2016-10-03 17:57:27 UTC (rev 206737)
+++ trunk/Source/JavaScriptCore/runtime/JSFunction.cpp 2016-10-03 18:36:12 UTC (rev 206738)
</span><span class="lines">@@ -357,12 +357,16 @@
</span><span class="cx"> PropertyOffset offset = thisObject->getDirectOffset(vm, propertyName, attributes);
</span><span class="cx"> if (!isValidOffset(offset)) {
</span><span class="cx"> JSObject* prototype = nullptr;
</span><del>- if (thisObject->jsExecutable()->parseMode() == SourceParseMode::GeneratorWrapperFunctionMode)
</del><ins>+ if (thisObject->jsExecutable()->parseMode() == SourceParseMode::GeneratorWrapperFunctionMode) {
+ // Unlike function instances, the object that is the value of the a GeneratorFunction's prototype
+ // property does not have a constructor property whose value is the GeneratorFunction instance.
+ // https://tc39.github.io/ecma262/#sec-generatorfunction-instances-prototype
</ins><span class="cx"> prototype = constructEmptyObject(exec, thisObject->globalObject(vm)->generatorPrototype());
</span><del>- else
</del><ins>+ } else {
</ins><span class="cx"> prototype = constructEmptyObject(exec);
</span><ins>+ prototype->putDirect(vm, vm.propertyNames->constructor, thisObject, DontEnum);
+ }
</ins><span class="cx">
</span><del>- prototype->putDirect(vm, vm.propertyNames->constructor, thisObject, DontEnum);
</del><span class="cx"> thisObject->putDirect(vm, vm.propertyNames->prototype, prototype, DontDelete | DontEnum);
</span><span class="cx"> offset = thisObject->getDirectOffset(vm, vm.propertyNames->prototype, attributes);
</span><span class="cx"> ASSERT(isValidOffset(offset));
</span></span></pre>
</div>
</div>
</body>
</html>