<!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>[207347] 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/207347">207347</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-10-14 11:14:03 -0700 (Fri, 14 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>test262: @isConstructor incorrectly thinks Math.cos is a constructor
https://bugs.webkit.org/show_bug.cgi?id=163437
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2016-10-14
Reviewed by Saam Barati.
JSTests:
* stress/is-constructor.js: Added.
(assert):
(prototype.assert):
New test to cover the @isConstructor builtin.
* test262.yaml:
Test now passes.
Source/JavaScriptCore:
* runtime/JSFunction.cpp:
(JSC::JSFunction::getConstructData):
By default, Host JSFunctions are not constructable. They get
the default callHostFunctionAsConstructor native constructor.
When getting construct data we can return ConstructType::None
in these cases instead of indicating it might be constructable
and later throwing an exception when construction is attempted.</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>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkJSTestsstressisconstructorjs">trunk/JSTests/stress/is-constructor.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/ChangeLog (207346 => 207347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/ChangeLog 2016-10-14 18:06:47 UTC (rev 207346)
+++ trunk/JSTests/ChangeLog 2016-10-14 18:14:03 UTC (rev 207347)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-10-14 Joseph Pecoraro <pecoraro@apple.com>
+
+ test262: @isConstructor incorrectly thinks Math.cos is a constructor
+ https://bugs.webkit.org/show_bug.cgi?id=163437
+
+ Reviewed by Saam Barati.
+
+ * stress/is-constructor.js: Added.
+ (assert):
+ (prototype.assert):
+ New test to cover the @isConstructor builtin.
+
+ * test262.yaml:
+ Test now passes.
+
</ins><span class="cx"> 2016-10-14 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r207322.
</span></span></pre></div>
<a id="trunkJSTestsstressisconstructorjs"></a>
<div class="addfile"><h4>Added: trunk/JSTests/stress/is-constructor.js (0 => 207347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/stress/is-constructor.js (rev 0)
+++ trunk/JSTests/stress/is-constructor.js 2016-10-14 18:14:03 UTC (rev 207347)
</span><span class="lines">@@ -0,0 +1,99 @@
</span><ins>+function assert(x) {
+ if (!x)
+ throw Error("Bad");
+}
+
+let isConstructor = createBuiltin("(function(c) { return @isConstructor(c); })");
+
+// Functions.
+assert(isConstructor(assert));
+assert(isConstructor(class{}));
+assert(isConstructor(function(){}));
+
+// Proxy functions.
+assert(isConstructor(new Proxy(assert, {})));
+assert(isConstructor(new Proxy(class{}, {})));
+assert(isConstructor(new Proxy(function(){}, {})));
+
+// Bound functions.
+assert(isConstructor(assert.bind(null), {}));
+assert(isConstructor((class{}).bind(null), {}));
+assert(isConstructor(function(){}.bind(null), {}));
+
+// Builtin constructors.
+assert(isConstructor(Array));
+assert(isConstructor(ArrayBuffer));
+assert(isConstructor(Boolean));
+assert(isConstructor(Date));
+assert(isConstructor(Error));
+assert(isConstructor(Function));
+assert(isConstructor(Map));
+assert(isConstructor(Number));
+assert(isConstructor(Object));
+assert(isConstructor(Promise));
+assert(isConstructor(Proxy));
+assert(isConstructor(RegExp));
+assert(isConstructor(Set));
+assert(isConstructor(String));
+assert(isConstructor(WeakMap));
+assert(isConstructor(WeakSet));
+
+// Non-function values.
+assert(!isConstructor(undefined));
+assert(!isConstructor(null));
+assert(!isConstructor(true));
+assert(!isConstructor(false));
+assert(!isConstructor(0));
+assert(!isConstructor(1));
+assert(!isConstructor(1.1));
+assert(!isConstructor(-1));
+assert(!isConstructor(Date.now()));
+assert(!isConstructor(new Date));
+assert(!isConstructor(Infinity));
+assert(!isConstructor(NaN));
+assert(!isConstructor(""));
+assert(!isConstructor("test"));
+assert(!isConstructor([]));
+assert(!isConstructor({}));
+assert(!isConstructor(/regex/));
+assert(!isConstructor(Math));
+assert(!isConstructor(JSON));
+assert(!isConstructor(Symbol()));
+assert(!isConstructor(new Error));
+assert(!isConstructor(new Proxy({}, {})));
+assert(!isConstructor(Array.prototype));
+
+// Symbol is not a constructor.
+assert(!isConstructor(Symbol));
+
+// Getters / setters are not constructors.
+assert(!isConstructor(Object.getOwnPropertyDescriptor({get f(){}}, "f").get));
+assert(!isConstructor(Object.getOwnPropertyDescriptor({set f(x){}}, "f").set));
+
+// Arrow functions are not constructors.
+assert(!isConstructor(()=>{}));
+
+// Generators are not constructors.
+assert(!isConstructor(function*(){}));
+
+// Native builtins are not constructors.
+assert(!isConstructor(isConstructor));
+
+// https://tc39.github.io/ecma262/#sec-built-in-function-objects
+// Built-in function objects that are not identified as constructors do not
+// implement the [[Construct]] internal method unless otherwise specified in
+// the description of a particular function.
+assert(!isConstructor(Array.of));
+assert(!isConstructor(Object.getOwnPropertyDescriptor));
+assert(!isConstructor(Date.now));
+assert(!isConstructor(Math.cos));
+assert(!isConstructor(JSON.stringify));
+assert(!isConstructor(Promise.all));
+assert(!isConstructor(Symbol.for));
+assert(!isConstructor(Array.prototype.push));
+
+// Proxy and bound functions carry forward non-constructor-ness.
+assert(!isConstructor(new Proxy(Symbol, {})));
+assert(!isConstructor(new Proxy(Math.cos, {})));
+assert(!isConstructor(Symbol.bind(null)));
+assert(!isConstructor(Math.cos.bind(null)));
</ins></span></pre></div>
<a id="trunkJSTeststest262yaml"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/test262.yaml (207346 => 207347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/test262.yaml 2016-10-14 18:06:47 UTC (rev 207346)
+++ trunk/JSTests/test262.yaml 2016-10-14 18:14:03 UTC (rev 207347)
</span><span class="lines">@@ -3054,9 +3054,9 @@
</span><span class="cx"> - path: test262/test/built-ins/Array/of/return-a-custom-instance.js
</span><span class="cx"> cmd: runTest262 :normal, "NoException", ["../../../../harness/assert.js", "../../../../harness/sta.js"], [:strict]
</span><span class="cx"> - path: test262/test/built-ins/Array/of/return-a-new-array-object.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/built-ins/Array/of/return-a-new-array-object.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/built-ins/Array/of/return-abrupt-from-contructor.js
</span><span class="cx"> cmd: runTest262 :normal, "NoException", ["../../../../harness/assert.js", "../../../../harness/sta.js"], []
</span><span class="cx"> - path: test262/test/built-ins/Array/of/return-abrupt-from-contructor.js
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (207346 => 207347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-10-14 18:06:47 UTC (rev 207346)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-10-14 18:14:03 UTC (rev 207347)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-10-14 Joseph Pecoraro <pecoraro@apple.com>
+
+ test262: @isConstructor incorrectly thinks Math.cos is a constructor
+ https://bugs.webkit.org/show_bug.cgi?id=163437
+
+ Reviewed by Saam Barati.
+
+ * runtime/JSFunction.cpp:
+ (JSC::JSFunction::getConstructData):
+ By default, Host JSFunctions are not constructable. They get
+ the default callHostFunctionAsConstructor native constructor.
+ When getting construct data we can return ConstructType::None
+ in these cases instead of indicating it might be constructable
+ and later throwing an exception when construction is attempted.
+
</ins><span class="cx"> 2016-10-14 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r207322.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSFunctioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSFunction.cpp (207346 => 207347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSFunction.cpp 2016-10-14 18:06:47 UTC (rev 207346)
+++ trunk/Source/JavaScriptCore/runtime/JSFunction.cpp 2016-10-14 18:14:03 UTC (rev 207347)
</span><span class="lines">@@ -573,6 +573,8 @@
</span><span class="cx"> JSFunction* thisObject = jsCast<JSFunction*>(cell);
</span><span class="cx">
</span><span class="cx"> if (thisObject->isHostFunction()) {
</span><ins>+ if (thisObject->nativeConstructor() == callHostFunctionAsConstructor)
+ return ConstructType::None;
</ins><span class="cx"> constructData.native.function = thisObject->nativeConstructor();
</span><span class="cx"> return ConstructType::Host;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>