<!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>[197815] 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/197815">197815</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2016-03-08 16:01:09 -0800 (Tue, 08 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Implement Function.name support for getters/setters and inferring name of function properties.
https://bugs.webkit.org/show_bug.cgi?id=154865
Reviewed by Geoffrey Garen.
Source/JavaScriptCore:
1. toString() no longer uses the value of Function.name as the name of the
function in the returned string, because ...
i. Function.name is supposed to be configurable. Hence, it can be made
writable and can be set to any JSValue, or deleted.
ii. Function.prototype.toString() is supposed to produce a string that can be
eval'ed. Hence, for JS functions, the function name in the produced
string must be a legal function name (and not some arbitrary value set in
Function.name). For example, while a number is a legal value for
Function.name, it is not legal as the function name in the toString()
string.
Instead, we'll always use the original name from the JS source that the
function was parsed from.
2. JSFunction::name() now always return the original name, not the value of
the Function.name property. As a result, it also no longer needs an
ExecState* arg.
If the original name is an empty string, JSFunction::name() will use the
inferred name.
3. For JS functions, the original name can be attained from their
FunctionExecutable object.
For host/native functions (which do not have a FunctionExecutable), we get the
"original" name from its NativeExecutable.
4. The m_hostFunctionStubMap now keys its NativeExecutable pointers using the
original name, in addition to the native function and constructor pointers.
This is needed because we want a different NativeExecutable for functions with
a different name (to satisfy (3) above).
5. Changed JSBoundFunction to store the name of its bound function in its
NativeExecutable. This will later be used to generate the toString() string.
It's Function.name value is eagerly initialized at construction time.
6. Function.name for getters/setters are now prefixed with "get"/"set".
This was done both for the JSBoundSlotBaseFunctions and JS definable get/set
functions.
7. Added InternalFunction::m_originalName so that we can use it to generate the
toString() string. We're storing it as a JSString instead of a WTF::String
only because we want InternalFunction to be continue to be trivially
destructible.
* inspector/JSInjectedScriptHost.cpp:
(Inspector::JSInjectedScriptHost::functionDetails):
* jit/JITThunks.cpp:
(JSC::JITThunks::finalize):
(JSC::JITThunks::hostFunctionStub):
* jit/JITThunks.h:
* runtime/Executable.h:
* runtime/FunctionPrototype.cpp:
(JSC::functionProtoFuncToString):
* runtime/InternalFunction.cpp:
(JSC::InternalFunction::finishCreation):
(JSC::InternalFunction::visitChildren):
(JSC::InternalFunction::name):
(JSC::InternalFunction::displayName):
* runtime/InternalFunction.h:
* runtime/JSBoundFunction.cpp:
(JSC::JSBoundFunction::create):
(JSC::JSBoundFunction::visitChildren):
(JSC::JSBoundFunction::toStringName): Deleted.
* runtime/JSBoundFunction.h:
(JSC::JSBoundFunction::boundThis):
(JSC::JSBoundFunction::boundArgs):
(JSC::JSBoundFunction::createStructure):
* runtime/JSBoundSlotBaseFunction.cpp:
(JSC::boundSlotBaseFunctionCall):
(JSC::JSBoundSlotBaseFunction::create):
* runtime/JSFunction.cpp:
(JSC::JSFunction::initializeRareData):
(JSC::JSFunction::name):
(JSC::JSFunction::displayName):
(JSC::JSFunction::calculatedDisplayName):
(JSC::JSFunction::reifyName):
* runtime/JSFunction.h:
* tests/es6.yaml:
LayoutTests:
* js/function-toString-vs-name-expected.txt: Added.
* js/function-toString-vs-name.html: Added.
* js/script-tests/function-toString-vs-name.js: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsinspectormodelremoteobjectgetpropertiesexpectedtxt">trunk/LayoutTests/inspector/model/remote-object-get-properties-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmachttptestsmediamediasourceSourceBufferabortreadyStateexpectedtxt">trunk/LayoutTests/platform/mac/http/tests/media/media-source/SourceBuffer-abort-readyState-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmachttptestsmediamediasourceSourceBufferabortremovedexpectedtxt">trunk/LayoutTests/platform/mac/http/tests/media/media-source/SourceBuffer-abort-removed-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmachttptestsmediamediasourceSourceBufferabortupdatingexpectedtxt">trunk/LayoutTests/platform/mac/http/tests/media/media-source/SourceBuffer-abort-updating-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmachttptestsmediamediasourcemediasourcesourcebuffermodeexpectedtxt">trunk/LayoutTests/platform/mac/http/tests/media/media-source/mediasource-sourcebuffer-mode-expected.txt</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorJSInjectedScriptHostcpp">trunk/Source/JavaScriptCore/inspector/JSInjectedScriptHost.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITThunkscpp">trunk/Source/JavaScriptCore/jit/JITThunks.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITThunksh">trunk/Source/JavaScriptCore/jit/JITThunks.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeExecutableh">trunk/Source/JavaScriptCore/runtime/Executable.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeFunctionPrototypecpp">trunk/Source/JavaScriptCore/runtime/FunctionPrototype.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeInternalFunctioncpp">trunk/Source/JavaScriptCore/runtime/InternalFunction.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeInternalFunctionh">trunk/Source/JavaScriptCore/runtime/InternalFunction.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSBoundFunctioncpp">trunk/Source/JavaScriptCore/runtime/JSBoundFunction.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSBoundFunctionh">trunk/Source/JavaScriptCore/runtime/JSBoundFunction.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSBoundSlotBaseFunctioncpp">trunk/Source/JavaScriptCore/runtime/JSBoundSlotBaseFunction.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSCJSValuecpp">trunk/Source/JavaScriptCore/runtime/JSCJSValue.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSFunctioncpp">trunk/Source/JavaScriptCore/runtime/JSFunction.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSFunctionh">trunk/Source/JavaScriptCore/runtime/JSFunction.h</a></li>
<li><a href="#trunkSourceJavaScriptCoretestses6yaml">trunk/Source/JavaScriptCore/tests/es6.yaml</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsjsfunctiontoStringvsnameexpectedtxt">trunk/LayoutTests/js/function-toString-vs-name-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsfunctiontoStringvsnamehtml">trunk/LayoutTests/js/function-toString-vs-name.html</a></li>
<li><a href="#trunkLayoutTestsjsscripttestsfunctiontoStringvsnamejs">trunk/LayoutTests/js/script-tests/function-toString-vs-name.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (197814 => 197815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-03-08 23:59:18 UTC (rev 197814)
+++ trunk/LayoutTests/ChangeLog 2016-03-09 00:01:09 UTC (rev 197815)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-03-08 Mark Lam <mark.lam@apple.com>
+
+ Implement Function.name support for getters/setters and inferring name of function properties.
+ https://bugs.webkit.org/show_bug.cgi?id=154865
+
+ Reviewed by Geoffrey Garen.
+
+ * js/function-toString-vs-name-expected.txt: Added.
+ * js/function-toString-vs-name.html: Added.
+ * js/script-tests/function-toString-vs-name.js: Added.
+
</ins><span class="cx"> 2016-03-08 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Font size computed style is innaccurate
</span></span></pre></div>
<a id="trunkLayoutTestsinspectormodelremoteobjectgetpropertiesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/model/remote-object-get-properties-expected.txt (197814 => 197815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/model/remote-object-get-properties-expected.txt 2016-03-08 23:59:18 UTC (rev 197814)
+++ trunk/LayoutTests/inspector/model/remote-object-get-properties-expected.txt 2016-03-09 00:01:09 UTC (rev 197815)
</span><span class="lines">@@ -220,7 +220,7 @@
</span><span class="cx"> -----------------------------------------------------
</span><span class="cx"> EXPRESSION: window.boundFunction
</span><span class="cx"> type: function
</span><del>-description: function () {
</del><ins>+description: function unboundFunction() {
</ins><span class="cx"> [native code]
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsjsfunctiontoStringvsnameexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/function-toString-vs-name-expected.txt (0 => 197815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/function-toString-vs-name-expected.txt (rev 0)
+++ trunk/LayoutTests/js/function-toString-vs-name-expected.txt 2016-03-09 00:01:09 UTC (rev 197815)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsjsfunctiontoStringvsnamehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/function-toString-vs-name.html (0 => 197815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/function-toString-vs-name.html (rev 0)
+++ trunk/LayoutTests/js/function-toString-vs-name.html 2016-03-09 00:01:09 UTC (rev 197815)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../resources/js-test-pre.js"></script>
+</head>
+<body>
+<script src="script-tests/function-toString-vs-name.js"></script>
+<script src="../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsjsscripttestsfunctiontoStringvsnamejs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/script-tests/function-toString-vs-name.js (0 => 197815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/script-tests/function-toString-vs-name.js (rev 0)
+++ trunk/LayoutTests/js/script-tests/function-toString-vs-name.js 2016-03-09 00:01:09 UTC (rev 197815)
</span><span class="lines">@@ -0,0 +1,419 @@
</span><ins>+// isWhiteSpace() and stripSpaces() are borrowed from
+// kde/script-tests/inbuilt_function_tostring.js and modified.
+
+let section;
+let failures = "";
+let failureCount = 0;
+
+function isWhiteSpace(string) {
+ let cc = string.charCodeAt(0);
+ switch (cc) {
+ case (0x0009):
+ case (0x000B):
+ case (0x000C):
+ case (0x0020):
+ case (0x000A):
+ case (0x000D):
+ case (59): // let's strip out semicolons, too
+ return true;
+ break;
+ default:
+ return false;
+ }
+}
+
+function minimizeSpaces(s) {
+ let currentChar;
+ let strippedString;
+ let previousCharIsWhiteSpace = false;
+ for (currentChar = 0, strippedString = ""; currentChar < s.length; currentChar++) {
+ let ch = s.charAt(currentChar);
+ if (!isWhiteSpace(ch)) {
+ if (previousCharIsWhiteSpace &&
+ (ch == '(' || ch == ')' || ch == '{' || ch == '}' || ch == '[' || ch == ']'))
+ strippedString = strippedString.slice(0, strippedString.length - 1);
+ strippedString += ch;
+ previousCharIsWhiteSpace = false;
+ } else if (!previousCharIsWhiteSpace) {
+ strippedString += ' ';
+ previousCharIsWhiteSpace = true;
+ }
+ }
+ return strippedString;
+}
+
+function shouldBe(desc, funcName, actual, expected) {
+ if (typeof(actual) !== typeof(expected)) {
+ failures += (" " + section + ": " + desc + "'" + funcName + "': typeof expected: " + typeof(expected) + ", typeof actual: " + typeof(actual) + "\n");
+ failures += (" expected: '" + expected + "', actual: '" + actual + "'\n");
+ failureCount++;
+ } else if (typeof(actual) !== typeof(expected) || actual !== expected) {
+ failures += (" " + section + ": " + desc + "'" + funcName + "': expected: '" + expected + "', actual: '" + actual + "'\n");
+ failureCount++;
+ }
+}
+
+function toString(x) {
+ if (typeof x === "symbol")
+ return x.toString();
+ return "" + x;
+}
+
+function test(func, expectedName, expectedToString) {
+ shouldBe("Function.name on ", expectedName, func.name, expectedName);
+
+ let str = func.toString();
+ shouldBe("Function#toString on ", expectedName, minimizeSpaces(str), minimizeSpaces(expectedToString));
+
+ let origDesc = Object.getOwnPropertyDescriptor(func, "name");
+ shouldBe("Function.name configurability of ", expectedName, origDesc.configurable, true);
+ shouldBe("Function.name writability of ", expectedName, origDesc.writable, false);
+ shouldBe("Function.name enumerability of ", expectedName, origDesc.enumerable, false);
+
+ // We should not be able to change Function.name while it is not writable.
+ let origFuncName = func.name;
+ let modifiedFuncName = "modified_" + toString(origFuncName);
+ func.name = modifiedFuncName;
+ shouldBe("Function.name (after attempted write) on ", expectedName, func.name, expectedName);
+
+ // We should be able to change Function.name after making it writable.
+ Object.defineProperty(func, "name", { writable: true });
+ let modifiedDesc = Object.getOwnPropertyDescriptor(func, "name");
+ shouldBe("Function.name writability (after made writable) of ", expectedName, modifiedDesc.writable, true);
+
+ func.name = modifiedFuncName;
+ shouldBe("Function.name (after attempted write again) on ", expectedName, func.name, modifiedFuncName);
+
+ // But the toString name should not have changed.
+ str = func.toString();
+ shouldBe("Function#toString (after attempted write) on ", expectedName, minimizeSpaces(str), minimizeSpaces(expectedToString));
+
+ // Put things back to the original state.
+ Object.defineProperty(func, "name", origDesc);
+}
+
+section = "builtin function";
+{
+ test(Array.prototype.every, "every", "function every() { [native code] }");
+ test(Array.prototype.forEach, "forEach", "function forEach() { [native code] }");
+ test(Array.prototype.some, "some", "function some() { [native code] }");
+
+ section = "bound builtin function";
+ {
+ let o = {}
+ let boundEvery = Array.prototype.every.bind(o);
+ test(boundEvery, "bound every", "function every() { [native code] }");
+ let boundForEach = Array.prototype.forEach.bind(o);
+ test(boundForEach, "bound forEach", "function forEach() { [native code] }");
+ }
+}
+
+section = "native function";
+{
+ test(Array.prototype.splice, "splice", "function splice() { [native code] }");
+ test(Array.prototype.unshift, "unshift", "function unshift() { [native code] }");
+ test(Array.prototype.indexOf, "indexOf", "function indexOf() { [native code] }");
+
+ section = "bound native function";
+ {
+ let o = {}
+ let boundSplice = Array.prototype.splice.bind(o);
+ test(boundSplice, "bound splice", "function splice() { [native code] }");
+ let boundUnshift = Array.prototype.unshift.bind(o);
+ test(boundUnshift, "bound unshift", "function unshift() { [native code] }");
+ }
+}
+
+section = "InternalFunction";
+{
+ test(Array, "Array", "function Array() { [native code] }");
+ test(Boolean, "Boolean", "function Boolean() { [native code] }");
+
+ section = "bound InternalFunction";
+ {
+ let o = {}
+ let boundArray = Array.bind(o);
+ test(boundArray, "bound Array", "function Array() { [native code] }");
+ let boundBoolean = Boolean.bind(o);
+ test(boundBoolean, "bound Boolean", "function Boolean() { [native code] }");
+ }
+}
+
+section = "JS function";
+{
+ function foo1() {}
+ test(foo1, "foo1", "function foo1() {}");
+
+ let foo2 = function() {}
+ test(foo2, "foo2", "function() {}");
+
+ let foo3 = (function() {
+ function goo3() {}
+ return goo3;
+ }) ();
+ test(foo3, "goo3", "function goo3() {}");
+
+ let foo4 = (function() {
+ return (function() {});
+ }) ();
+ test(foo4, "", "function() {}");
+
+ // Test functions in object properties.
+ section = "Object property";
+ let o = {
+ prop1: function() {},
+ prop2: function namedProp2() {}
+ };
+ test(o.prop1, "prop1", "function() {}");
+ test(o.prop2, "namedProp2", "function namedProp2() {}");
+
+ section = "bound JS function";
+ {
+ let o = {}
+ let boundFoo1 = foo1.bind(o);
+ test(boundFoo1, "bound foo1", "function foo1() { [native code] }");
+ let boundFoo2 = foo2.bind(o);
+ test(boundFoo2, "bound foo2", "function foo2() { [native code] }");
+ let boundFoo3 = foo3.bind(o);
+ test(boundFoo3, "bound goo3", "function goo3() { [native code] }");
+ let boundFoo4 = foo4.bind(o);
+ test(boundFoo4, "bound ", "function () { [native code] }");
+
+ test((function(){}).bind({}), "bound ", "function () { [native code] }");
+ }
+}
+
+section = "object shorthand method";
+{
+ let o = {
+ prop1() {},
+ prop2(x) {}
+ };
+ test(o.prop1, "prop1", "function prop1() {}");
+ test(o.prop2, "prop2", "function prop2(x) {}");
+
+ section = "bound object shorthand method";
+ {
+ let boundProp1 = o.prop1.bind(o);
+ test(boundProp1, "bound prop1", "function prop1() { [native code] }");
+ let boundProp2 = o.prop2.bind(o);
+ test(boundProp2, "bound prop2", "function prop2() { [native code] }");
+ }
+}
+
+// FIXME: Uncomment these when we've added support for Function.name of computed properties.
+// section = "Object computed string property";
+// {
+// let str1 = "foo";
+// let str2 = "";
+// let o = {
+// [str1]: function() {},
+// [str2]: function() {}
+// };
+// test(o[str1], "foo", "function() {}");
+// test(o[str2], "", "function() {}");
+// }
+//
+// let sym1 = Symbol("foo");
+// let sym2 = Symbol();
+
+// section = "Object computed symbol property";
+// {
+// let o = {
+// [sym1]: function() {},
+// [sym2]: function() {}
+// };
+// test(o[sym1], "[foo]", "function() {}");
+// test(o[sym2], "", "function() {}");
+// }
+
+// section = "Object computed symbol property with shorthand function";
+// {
+// let o = {
+// [sym1]() {},
+// [sym2]() {}
+// };
+// test(o[sym1], "[foo]", "function() {}");
+// test(o[sym2], "", "function() {}");
+// }
+
+// section = "Object computed symbol property with get/set function";
+// {
+// let o = {
+// get [sym1]() {},
+// set [sym1](x) {},
+// get [sym2]() {},
+// set [sym2](x) {}
+// };
+// let desc = Object.getOwnPropertyDescriptor(o, sym1);
+// test(desc.get, "get [foo]", "function() {}");
+// test(desc.set, "set [foo]", "function(x) {}");
+//
+// desc = Object.getOwnPropertyDescriptor(o, sym2);
+// test(desc.get, "get ", "function() {}");
+// test(desc.set, "set ", "function(x) {}");
+// }
+
+// Test functions in destructuring assignments.
+section = "destructuring assignment";
+{
+ let prop1;
+ let prop2;
+ { prop1 = function() {}, prop2 = function namedProp2() {} }
+ test(prop1, "prop1", "function() {}");
+ test(prop2, "namedProp2", "function namedProp2() {}");
+
+ section = "bound destructuring assignment";
+ {
+ let o = {}
+ let bound1 = prop1.bind(o);
+ test(bound1, "bound prop1", "function prop1() { [native code] }");
+
+ let bound2 = prop2.bind(o);
+ test(bound2, "bound namedProp2", "function namedProp2() { [native code] }");
+ }
+}
+
+section = "dynamically created function";
+{
+ let dynamic1 = new Function("");
+ test(dynamic1, "anonymous", "function anonymous() {}");
+
+ let dynamic2 = new Function("");
+ dynamic2.name = "Goo2";
+ test(dynamic2, "anonymous", "function anonymous() {}");
+
+ section = "bound dynamically created function";
+ {
+ let o = {}
+ let bound1 = dynamic1.bind(o);
+ test(bound1, "bound anonymous", "function anonymous() { [native code] }");
+
+ let bound2 = dynamic2.bind(o);
+ test(bound2, "bound anonymous", "function anonymous() { [native code] }");
+ }
+}
+
+section = "JSBoundSlotBaseFunction";
+{
+ if (typeof document !== "undefined") {
+ let desc = Object.getOwnPropertyDescriptor(document, "location");
+ test(desc.get, "get location", "function location() { [native code] }");
+ test(desc.set, "set location", "function location() { [native code] }");
+
+ section = "bound JSBoundSlotBaseFunction";
+ {
+ let o = {}
+ let bound1 = desc.get.bind(o);
+ test(bound1, "bound get location", "function get location() { [native code] }");
+
+ let bound2 = desc.set.bind(o);
+ test(bound2, "bound set location", "function set location() { [native code] }");
+ }
+ }
+}
+
+section = "get/set function";
+{
+ let o = { get foo() {}, set foo(x){} };
+ let desc = Object.getOwnPropertyDescriptor(o, "foo");
+ test(desc.get, "get foo", "function() {}");
+ test(desc.set, "set foo", "function(x) {}");
+
+ let o1 = { get "bar"() {}, set "bar"(x){} };
+ let desc1 = Object.getOwnPropertyDescriptor(o1, "bar");
+ test(desc1.get, "get bar", "function() {}");
+ test(desc1.set, "set bar", "function(x) {}");
+
+ let o2 = { get 100() {}, set 100(x){} };
+ let desc2 = Object.getOwnPropertyDescriptor(o2, 100);
+ test(desc2.get, "get ", "function() {}");
+ test(desc2.set, "set ", "function(x) {}");
+
+ let o3 = { get [100]() {}, set [100](x){} };
+ let desc3 = Object.getOwnPropertyDescriptor(o3, 100);
+ test(desc3.get, "get ", "function() {}");
+ test(desc3.set, "set ", "function(x) {}");
+
+ section = "bound get/set function";
+ {
+ let bound1;
+ let bound2;
+
+ bound1 = desc.get.bind(o);
+ test(bound1, "bound get foo", "function get foo() { [native code] }");
+ bound2 = desc.set.bind(o);
+ test(bound2, "bound set foo", "function set foo() { [native code] }");
+
+ bound1 = desc1.get.bind(o);
+ test(bound1, "bound get bar", "function get bar() { [native code] }");
+ bound2 = desc1.set.bind(o);
+ test(bound2, "bound set bar", "function set bar() { [native code] }");
+
+ bound1 = desc2.get.bind(o);
+ test(bound1, "bound get ", "function get () { [native code] }");
+ bound2 = desc2.set.bind(o);
+ test(bound2, "bound set ", "function set () { [native code] }");
+
+ bound1 = desc3.get.bind(o);
+ test(bound1, "bound get ", "function get () { [native code] }");
+ bound2 = desc3.set.bind(o);
+ test(bound2, "bound set ", "function set () { [native code] }");
+ }
+}
+
+// https://tc39.github.io/ecma262/#sec-function.prototype.bind
+// 9. Let targetName be ? Get(Target, "name").
+// 10. If Type(targetName) is not String, let targetName be the empty string.
+// 11. Perform SetFunctionName(F, targetName, "bound").
+section = "bound functions with non-string names";
+{
+ let foo = function() {};
+ let bound;
+
+ function setName(func, newName) {
+ Object.defineProperty(func, "name", { writable:true });
+ func.name = newName;
+ Object.defineProperty(func, "name", { writable:false });
+ }
+
+ setName(foo, undefined);
+ test(foo, undefined, "function() {}");
+ bound = foo.bind({});
+ test(bound, "bound ", "function () { [native code] }");
+
+ setName(foo, null);
+ test(foo, null, "function() {}");
+ bound = foo.bind({});
+ test(bound, "bound ", "function () { [native code] }");
+
+ setName(foo, true);
+ test(foo, true, "function() {}");
+ bound = foo.bind({});
+ test(bound, "bound ", "function () { [native code] }");
+
+ setName(foo, false);
+ test(foo, false, "function() {}");
+ bound = foo.bind({});
+ test(bound, "bound ", "function () { [native code] }");
+
+ setName(foo, 1234.567);
+ test(foo, 1234.567, "function() {}");
+ bound = foo.bind({});
+ test(bound, "bound ", "function () { [native code] }");
+
+ let anonSym = Symbol();
+ setName(foo, anonSym);
+ test(foo, anonSym, "function() {}");
+ bound = foo.bind({});
+ test(bound, "bound ", "function () { [native code] }");
+
+ let sym = Symbol("baz");
+ setName(foo, sym);
+ test(foo, sym, "function() {}");
+ bound = foo.bind({});
+ test(bound, "bound ", "function () { [native code] }");
+}
+
+if (failureCount)
+ throw Error("Found " + failureCount + " failures:\n" + failures);
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmachttptestsmediamediasourceSourceBufferabortreadyStateexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/http/tests/media/media-source/SourceBuffer-abort-readyState-expected.txt (197814 => 197815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/http/tests/media/media-source/SourceBuffer-abort-readyState-expected.txt 2016-03-08 23:59:18 UTC (rev 197814)
+++ trunk/LayoutTests/platform/mac/http/tests/media/media-source/SourceBuffer-abort-readyState-expected.txt 2016-03-09 00:01:09 UTC (rev 197815)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> http://127.0.0.1:8000/media/media-source/SourceBuffer-abort-readyState.html:20:29
</span><span class="cx"> step@http://127.0.0.1:8000/w3c/resources/testharness.js:1160:30
</span><span class="cx"> isTypeSupported@http://127.0.0.1:8000/media/media-source/SourceBuffer-abort-readyState.html:19:18
</span><del>-bound isTypeSupported@[native code]
</del><ins>+isTypeSupported@[native code]
</ins><span class="cx"> http://127.0.0.1:8000/media/media-source/SourceBuffer-abort-readyState.html:42:36
</span><span class="cx"> step@http://127.0.0.1:8000/w3c/resources/testharness.js:1160:30
</span><span class="cx"> async_test@http://127.0.0.1:8000/w3c/resources/testharness.js:460:26
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmachttptestsmediamediasourceSourceBufferabortremovedexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/http/tests/media/media-source/SourceBuffer-abort-removed-expected.txt (197814 => 197815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/http/tests/media/media-source/SourceBuffer-abort-removed-expected.txt 2016-03-08 23:59:18 UTC (rev 197814)
+++ trunk/LayoutTests/platform/mac/http/tests/media/media-source/SourceBuffer-abort-removed-expected.txt 2016-03-09 00:01:09 UTC (rev 197815)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> http://127.0.0.1:8000/media/media-source/SourceBuffer-abort-removed.html:19:29
</span><span class="cx"> step@http://127.0.0.1:8000/w3c/resources/testharness.js:1160:30
</span><span class="cx"> isTypeSupported@http://127.0.0.1:8000/media/media-source/SourceBuffer-abort-removed.html:18:18
</span><del>-bound isTypeSupported@[native code]
</del><ins>+isTypeSupported@[native code]
</ins><span class="cx"> http://127.0.0.1:8000/media/media-source/SourceBuffer-abort-removed.html:28:36
</span><span class="cx"> step@http://127.0.0.1:8000/w3c/resources/testharness.js:1160:30
</span><span class="cx"> async_test@http://127.0.0.1:8000/w3c/resources/testharness.js:460:26
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmachttptestsmediamediasourceSourceBufferabortupdatingexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/http/tests/media/media-source/SourceBuffer-abort-updating-expected.txt (197814 => 197815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/http/tests/media/media-source/SourceBuffer-abort-updating-expected.txt 2016-03-08 23:59:18 UTC (rev 197814)
+++ trunk/LayoutTests/platform/mac/http/tests/media/media-source/SourceBuffer-abort-updating-expected.txt 2016-03-09 00:01:09 UTC (rev 197815)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> http://127.0.0.1:8000/media/media-source/SourceBuffer-abort-updating.html:33:29
</span><span class="cx"> step@http://127.0.0.1:8000/w3c/resources/testharness.js:1160:30
</span><span class="cx"> isTypeSupported@http://127.0.0.1:8000/media/media-source/SourceBuffer-abort-updating.html:32:18
</span><del>-bound isTypeSupported@[native code]
</del><ins>+isTypeSupported@[native code]
</ins><span class="cx"> http://127.0.0.1:8000/media/media-source/SourceBuffer-abort-updating.html:42:36
</span><span class="cx"> step@http://127.0.0.1:8000/w3c/resources/testharness.js:1160:30
</span><span class="cx"> async_test@http://127.0.0.1:8000/w3c/resources/testharness.js:460:26
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmachttptestsmediamediasourcemediasourcesourcebuffermodeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/http/tests/media/media-source/mediasource-sourcebuffer-mode-expected.txt (197814 => 197815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/http/tests/media/media-source/mediasource-sourcebuffer-mode-expected.txt 2016-03-08 23:59:18 UTC (rev 197814)
+++ trunk/LayoutTests/platform/mac/http/tests/media/media-source/mediasource-sourcebuffer-mode-expected.txt 2016-03-09 00:01:09 UTC (rev 197815)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> assert_throws@http://127.0.0.1:8000/w3c/resources/testharness.js:947:19
</span><span class="cx"> http://127.0.0.1:8000/media/media-source/mediasource-sourcebuffer-mode.html:114:32
</span><span class="cx"> handleWaitCallback_@http://127.0.0.1:8000/media/media-source/mediasource-util.js:97:17
</span><del>-bound @[native code]
</del><ins>+handleWaitCallback_@[native code]
</ins><span class="cx"> step@http://127.0.0.1:8000/w3c/resources/testharness.js:1160:30
</span><span class="cx"> http://127.0.0.1:8000/w3c/resources/testharness.js:1189:33)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (197814 => 197815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-03-08 23:59:18 UTC (rev 197814)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-03-09 00:01:09 UTC (rev 197815)
</span><span class="lines">@@ -1,3 +1,92 @@
</span><ins>+2016-03-08 Mark Lam <mark.lam@apple.com>
+
+ Implement Function.name support for getters/setters and inferring name of function properties.
+ https://bugs.webkit.org/show_bug.cgi?id=154865
+
+ Reviewed by Geoffrey Garen.
+
+ 1. toString() no longer uses the value of Function.name as the name of the
+ function in the returned string, because ...
+
+ i. Function.name is supposed to be configurable. Hence, it can be made
+ writable and can be set to any JSValue, or deleted.
+ ii. Function.prototype.toString() is supposed to produce a string that can be
+ eval'ed. Hence, for JS functions, the function name in the produced
+ string must be a legal function name (and not some arbitrary value set in
+ Function.name). For example, while a number is a legal value for
+ Function.name, it is not legal as the function name in the toString()
+ string.
+
+ Instead, we'll always use the original name from the JS source that the
+ function was parsed from.
+
+ 2. JSFunction::name() now always return the original name, not the value of
+ the Function.name property. As a result, it also no longer needs an
+ ExecState* arg.
+
+ If the original name is an empty string, JSFunction::name() will use the
+ inferred name.
+
+ 3. For JS functions, the original name can be attained from their
+ FunctionExecutable object.
+
+ For host/native functions (which do not have a FunctionExecutable), we get the
+ "original" name from its NativeExecutable.
+
+ 4. The m_hostFunctionStubMap now keys its NativeExecutable pointers using the
+ original name, in addition to the native function and constructor pointers.
+
+ This is needed because we want a different NativeExecutable for functions with
+ a different name (to satisfy (3) above).
+
+ 5. Changed JSBoundFunction to store the name of its bound function in its
+ NativeExecutable. This will later be used to generate the toString() string.
+ It's Function.name value is eagerly initialized at construction time.
+
+ 6. Function.name for getters/setters are now prefixed with "get"/"set".
+ This was done both for the JSBoundSlotBaseFunctions and JS definable get/set
+ functions.
+
+ 7. Added InternalFunction::m_originalName so that we can use it to generate the
+ toString() string. We're storing it as a JSString instead of a WTF::String
+ only because we want InternalFunction to be continue to be trivially
+ destructible.
+
+ * inspector/JSInjectedScriptHost.cpp:
+ (Inspector::JSInjectedScriptHost::functionDetails):
+ * jit/JITThunks.cpp:
+ (JSC::JITThunks::finalize):
+ (JSC::JITThunks::hostFunctionStub):
+ * jit/JITThunks.h:
+ * runtime/Executable.h:
+ * runtime/FunctionPrototype.cpp:
+ (JSC::functionProtoFuncToString):
+ * runtime/InternalFunction.cpp:
+ (JSC::InternalFunction::finishCreation):
+ (JSC::InternalFunction::visitChildren):
+ (JSC::InternalFunction::name):
+ (JSC::InternalFunction::displayName):
+ * runtime/InternalFunction.h:
+ * runtime/JSBoundFunction.cpp:
+ (JSC::JSBoundFunction::create):
+ (JSC::JSBoundFunction::visitChildren):
+ (JSC::JSBoundFunction::toStringName): Deleted.
+ * runtime/JSBoundFunction.h:
+ (JSC::JSBoundFunction::boundThis):
+ (JSC::JSBoundFunction::boundArgs):
+ (JSC::JSBoundFunction::createStructure):
+ * runtime/JSBoundSlotBaseFunction.cpp:
+ (JSC::boundSlotBaseFunctionCall):
+ (JSC::JSBoundSlotBaseFunction::create):
+ * runtime/JSFunction.cpp:
+ (JSC::JSFunction::initializeRareData):
+ (JSC::JSFunction::name):
+ (JSC::JSFunction::displayName):
+ (JSC::JSFunction::calculatedDisplayName):
+ (JSC::JSFunction::reifyName):
+ * runtime/JSFunction.h:
+ * tests/es6.yaml:
+
</ins><span class="cx"> 2016-03-08 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r197793 and r197799.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorJSInjectedScriptHostcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/JSInjectedScriptHost.cpp (197814 => 197815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/JSInjectedScriptHost.cpp 2016-03-08 23:59:18 UTC (rev 197814)
+++ trunk/Source/JavaScriptCore/inspector/JSInjectedScriptHost.cpp 2016-03-09 00:01:09 UTC (rev 197815)
</span><span class="lines">@@ -203,7 +203,7 @@
</span><span class="cx"> JSObject* result = constructEmptyObject(exec);
</span><span class="cx"> result->putDirect(exec->vm(), Identifier::fromString(exec, "location"), location);
</span><span class="cx">
</span><del>- String name = function->name(exec);
</del><ins>+ String name = function->name();
</ins><span class="cx"> if (!name.isEmpty())
</span><span class="cx"> result->putDirect(exec->vm(), Identifier::fromString(exec, "name"), jsString(exec, name));
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITThunkscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITThunks.cpp (197814 => 197815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITThunks.cpp 2016-03-08 23:59:18 UTC (rev 197814)
+++ trunk/Source/JavaScriptCore/jit/JITThunks.cpp 2016-03-09 00:01:09 UTC (rev 197815)
</span><span class="lines">@@ -79,14 +79,14 @@
</span><span class="cx"> void JITThunks::finalize(Handle<Unknown> handle, void*)
</span><span class="cx"> {
</span><span class="cx"> auto* nativeExecutable = jsCast<NativeExecutable*>(handle.get().asCell());
</span><del>- weakRemove(*m_hostFunctionStubMap, std::make_pair(nativeExecutable->function(), nativeExecutable->constructor()), nativeExecutable);
</del><ins>+ weakRemove(*m_hostFunctionStubMap, std::make_tuple(nativeExecutable->function(), nativeExecutable->constructor(), nativeExecutable->name()), nativeExecutable);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> NativeExecutable* JITThunks::hostFunctionStub(VM* vm, NativeFunction function, NativeFunction constructor, const String& name)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!isCompilationThread());
</span><span class="cx">
</span><del>- if (NativeExecutable* nativeExecutable = m_hostFunctionStubMap->get(std::make_pair(function, constructor)))
</del><ins>+ if (NativeExecutable* nativeExecutable = m_hostFunctionStubMap->get(std::make_tuple(function, constructor, name)))
</ins><span class="cx"> return nativeExecutable;
</span><span class="cx">
</span><span class="cx"> NativeExecutable* nativeExecutable = NativeExecutable::create(
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> function,
</span><span class="cx"> adoptRef(new NativeJITCode(MacroAssemblerCodeRef::createSelfManagedCodeRef(ctiNativeConstruct(vm)), JITCode::HostCallThunk)),
</span><span class="cx"> constructor, NoIntrinsic, name);
</span><del>- weakAdd(*m_hostFunctionStubMap, std::make_pair(function, constructor), Weak<NativeExecutable>(nativeExecutable, this));
</del><ins>+ weakAdd(*m_hostFunctionStubMap, std::make_tuple(function, constructor, name), Weak<NativeExecutable>(nativeExecutable, this));
</ins><span class="cx"> return nativeExecutable;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx"> ASSERT(!isCompilationThread());
</span><span class="cx"> ASSERT(vm->canUseJIT());
</span><span class="cx">
</span><del>- if (NativeExecutable* nativeExecutable = m_hostFunctionStubMap->get(std::make_pair(function, &callHostFunctionAsConstructor)))
</del><ins>+ if (NativeExecutable* nativeExecutable = m_hostFunctionStubMap->get(std::make_tuple(function, &callHostFunctionAsConstructor, name)))
</ins><span class="cx"> return nativeExecutable;
</span><span class="cx">
</span><span class="cx"> RefPtr<JITCode> forCall;
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx"> RefPtr<JITCode> forConstruct = adoptRef(new NativeJITCode(MacroAssemblerCodeRef::createSelfManagedCodeRef(ctiNativeConstruct(vm)), JITCode::HostCallThunk));
</span><span class="cx">
</span><span class="cx"> NativeExecutable* nativeExecutable = NativeExecutable::create(*vm, forCall, function, forConstruct, callHostFunctionAsConstructor, intrinsic, name);
</span><del>- weakAdd(*m_hostFunctionStubMap, std::make_pair(function, &callHostFunctionAsConstructor), Weak<NativeExecutable>(nativeExecutable, this));
</del><ins>+ weakAdd(*m_hostFunctionStubMap, std::make_tuple(function, &callHostFunctionAsConstructor, name), Weak<NativeExecutable>(nativeExecutable, this));
</ins><span class="cx"> return nativeExecutable;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITThunksh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITThunks.h (197814 => 197815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITThunks.h 2016-03-08 23:59:18 UTC (rev 197814)
+++ trunk/Source/JavaScriptCore/jit/JITThunks.h 2016-03-09 00:01:09 UTC (rev 197815)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx"> #include "Weak.h"
</span><span class="cx"> #include "WeakHandleOwner.h"
</span><span class="cx"> #include "WeakInlines.h"
</span><ins>+#include <tuple>
</ins><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx"> #include <wtf/ThreadingPrimitives.h>
</span><span class="lines">@@ -67,7 +68,39 @@
</span><span class="cx">
</span><span class="cx"> typedef HashMap<ThunkGenerator, MacroAssemblerCodeRef> CTIStubMap;
</span><span class="cx"> CTIStubMap m_ctiStubMap;
</span><del>- typedef HashMap<std::pair<NativeFunction, NativeFunction>, Weak<NativeExecutable>> HostFunctionStubMap;
</del><ins>+
+ typedef std::tuple<NativeFunction, NativeFunction, String> HostFunctionKey;
+
+ struct HostFunctionHash {
+ static unsigned hash(const HostFunctionKey& key)
+ {
+ unsigned hash = WTF::pairIntHash(hashPointer(std::get<0>(key)), hashPointer(std::get<1>(key)));
+ if (!std::get<2>(key).isNull())
+ hash = WTF::pairIntHash(hash, DefaultHash<String>::Hash::hash(std::get<2>(key)));
+ return hash;
+ }
+ static bool equal(const HostFunctionKey& a, const HostFunctionKey& b)
+ {
+ return (std::get<0>(a) == std::get<0>(b)) && (std::get<1>(a) == std::get<1>(b)) && (std::get<2>(a) == std::get<2>(b));
+ }
+ static const bool safeToCompareToEmptyOrDeleted = true;
+
+ private:
+ static inline unsigned hashPointer(NativeFunction p)
+ {
+ return DefaultHash<NativeFunction>::Hash::hash(p);
+ }
+ };
+
+ struct HostFunctionHashTrait : WTF::GenericHashTraits<HostFunctionKey> {
+ static const bool emptyValueIsZero = true;
+ static EmptyValueType emptyValue() { return std::make_tuple(nullptr, nullptr, String()); }
+
+ static void constructDeletedValue(HostFunctionKey& slot) { std::get<0>(slot) = reinterpret_cast<NativeFunction>(-1); }
+ static bool isDeletedValue(const HostFunctionKey& value) { return std::get<0>(value) == reinterpret_cast<NativeFunction>(-1); }
+ };
+
+ typedef HashMap<HostFunctionKey, Weak<NativeExecutable>, HostFunctionHash, HostFunctionHashTrait> HostFunctionStubMap;
</ins><span class="cx"> std::unique_ptr<HostFunctionStubMap> m_hostFunctionStubMap;
</span><span class="cx"> Lock m_lock;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeExecutableh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Executable.h (197814 => 197815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Executable.h 2016-03-08 23:59:18 UTC (rev 197814)
+++ trunk/Source/JavaScriptCore/runtime/Executable.h 2016-03-09 00:01:09 UTC (rev 197815)
</span><span class="lines">@@ -663,10 +663,15 @@
</span><span class="cx"> bool isBuiltinFunction() const { return m_unlinkedExecutable->isBuiltinFunction(); }
</span><span class="cx"> ConstructAbility constructAbility() const { return m_unlinkedExecutable->constructAbility(); }
</span><span class="cx"> bool isArrowFunction() const { return parseMode() == SourceParseMode::ArrowFunctionMode; }
</span><ins>+ bool isGetter() const { return parseMode() == SourceParseMode::GetterMode; }
+ bool isSetter() const { return parseMode() == SourceParseMode::SetterMode; }
</ins><span class="cx"> DerivedContextType derivedContextType() const { return m_unlinkedExecutable->derivedContextType(); }
</span><span class="cx"> bool isClassConstructorFunction() const { return m_unlinkedExecutable->isClassConstructorFunction(); }
</span><span class="cx"> const Identifier& name() { return m_unlinkedExecutable->name(); }
</span><span class="cx"> const Identifier& inferredName() { return m_unlinkedExecutable->inferredName(); }
</span><ins>+ // FIXME: ecmaName() needs to be reimplement to be based on ES6 rules of determining the inferred
+ // Function.name from non-computed names. https://bugs.webkit.org/show_bug.cgi?id=155203
+ const Identifier& ecmaName() { return inferredName(); }
</ins><span class="cx"> size_t parameterCount() const { return m_unlinkedExecutable->parameterCount(); } // Excluding 'this'!
</span><span class="cx"> SourceParseMode parseMode() const { return m_unlinkedExecutable->parseMode(); }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeFunctionPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/FunctionPrototype.cpp (197814 => 197815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/FunctionPrototype.cpp 2016-03-08 23:59:18 UTC (rev 197814)
+++ trunk/Source/JavaScriptCore/runtime/FunctionPrototype.cpp 2016-03-09 00:01:09 UTC (rev 197815)
</span><span class="lines">@@ -85,14 +85,8 @@
</span><span class="cx"> JSValue thisValue = exec->thisValue();
</span><span class="cx"> if (thisValue.inherits(JSFunction::info())) {
</span><span class="cx"> JSFunction* function = jsCast<JSFunction*>(thisValue);
</span><del>- if (function->isHostOrBuiltinFunction()) {
- String name;
- if (JSBoundFunction* boundFunction = jsDynamicCast<JSBoundFunction*>(function))
- name = boundFunction->toStringName(exec);
- else
- name = function->name(exec);
- return JSValue::encode(jsMakeNontrivialString(exec, "function ", name, "() {\n [native code]\n}"));
- }
</del><ins>+ if (function->isHostOrBuiltinFunction())
+ return JSValue::encode(jsMakeNontrivialString(exec, "function ", function->name(), "() {\n [native code]\n}"));
</ins><span class="cx">
</span><span class="cx"> FunctionExecutable* executable = function->jsExecutable();
</span><span class="cx">
</span><span class="lines">@@ -101,7 +95,7 @@
</span><span class="cx"> StringView source = executable->source().provider()->getRange(
</span><span class="cx"> executable->parametersStartOffset(),
</span><span class="cx"> executable->parametersStartOffset() + executable->source().length());
</span><del>- return JSValue::encode(jsMakeNontrivialString(exec, functionHeader, function->name(exec), source));
</del><ins>+ return JSValue::encode(jsMakeNontrivialString(exec, functionHeader, function->name(), source));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (thisValue.inherits(InternalFunction::info())) {
</span><span class="lines">@@ -167,7 +161,8 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- JSString* name = target.get(exec, exec->propertyNames().name).toString(exec);
</del><ins>+ JSValue nameProp = target.get(exec, exec->propertyNames().name);
+ JSString* name = nameProp.isString() ? nameProp.toString(exec) : jsEmptyString(exec);
</ins><span class="cx"> return JSValue::encode(JSBoundFunction::create(vm, exec, globalObject, targetObject, exec->argument(0), boundArgs, length, name->value(exec)));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeInternalFunctioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/InternalFunction.cpp (197814 => 197815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/InternalFunction.cpp 2016-03-08 23:59:18 UTC (rev 197814)
+++ trunk/Source/JavaScriptCore/runtime/InternalFunction.cpp 2016-03-09 00:01:09 UTC (rev 197815)
</span><span class="lines">@@ -44,14 +44,27 @@
</span><span class="cx"> Base::finishCreation(vm);
</span><span class="cx"> ASSERT(inherits(info()));
</span><span class="cx"> ASSERT(methodTable()->getCallData != InternalFunction::info()->methodTable.getCallData);
</span><del>- putDirect(vm, vm.propertyNames->name, jsString(&vm, name), DontDelete | ReadOnly | DontEnum);
</del><ins>+ JSString* nameString = jsString(&vm, name);
+ m_originalName.set(vm, this, nameString);
+ putDirect(vm, vm.propertyNames->name, nameString, ReadOnly | DontEnum);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-const String& InternalFunction::name(ExecState* exec)
</del><ins>+void InternalFunction::visitChildren(JSCell* cell, SlotVisitor& visitor)
</ins><span class="cx"> {
</span><del>- return asString(getDirect(exec->vm(), exec->vm().propertyNames->name))->tryGetValue();
</del><ins>+ InternalFunction* thisObject = jsCast<InternalFunction*>(cell);
+ ASSERT_GC_OBJECT_INHERITS(thisObject, info());
+ Base::visitChildren(thisObject, visitor);
+
+ visitor.append(&thisObject->m_originalName);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+const String& InternalFunction::name(ExecState*)
+{
+ const String& name = m_originalName->tryGetValue();
+ ASSERT(name); // m_originalName was built from a String, and hence, there is no rope to resolve.
+ return name;
+}
+
</ins><span class="cx"> const String InternalFunction::displayName(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue displayName = getDirect(exec->vm(), exec->vm().propertyNames->displayName);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeInternalFunctionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/InternalFunction.h (197814 => 197815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/InternalFunction.h 2016-03-08 23:59:18 UTC (rev 197814)
+++ trunk/Source/JavaScriptCore/runtime/InternalFunction.h 2016-03-09 00:01:09 UTC (rev 197815)
</span><span class="lines">@@ -38,6 +38,8 @@
</span><span class="cx">
</span><span class="cx"> DECLARE_EXPORT_INFO;
</span><span class="cx">
</span><ins>+ JS_EXPORT_PRIVATE static void visitChildren(JSCell*, SlotVisitor&);
+
</ins><span class="cx"> JS_EXPORT_PRIVATE const String& name(ExecState*);
</span><span class="cx"> const String displayName(ExecState*);
</span><span class="cx"> const String calculatedDisplayName(ExecState*);
</span><span class="lines">@@ -55,6 +57,7 @@
</span><span class="cx"> JS_EXPORT_PRIVATE void finishCreation(VM&, const String& name);
</span><span class="cx">
</span><span class="cx"> static CallType getCallData(JSCell*, CallData&);
</span><ins>+ WriteBarrier<JSString> m_originalName;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> InternalFunction* asInternalFunction(JSValue);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSBoundFunctioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSBoundFunction.cpp (197814 => 197815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSBoundFunction.cpp 2016-03-08 23:59:18 UTC (rev 197814)
+++ trunk/Source/JavaScriptCore/runtime/JSBoundFunction.cpp 2016-03-09 00:01:09 UTC (rev 197815)
</span><span class="lines">@@ -124,7 +124,7 @@
</span><span class="cx"> ConstructData constructData;
</span><span class="cx"> ConstructType constructType = JSC::getConstructData(targetFunction, constructData);
</span><span class="cx"> bool canConstruct = constructType != ConstructType::None;
</span><del>- NativeExecutable* executable = vm.getHostFunction(boundFunctionCall, canConstruct ? boundFunctionConstruct : callHostFunctionAsConstructor, ASCIILiteral("Function.prototype.bind result"));
</del><ins>+ NativeExecutable* executable = vm.getHostFunction(boundFunctionCall, canConstruct ? boundFunctionConstruct : callHostFunctionAsConstructor, name);
</ins><span class="cx"> Structure* structure = getBoundFunctionStructure(vm, exec, globalObject, targetFunction);
</span><span class="cx"> if (UNLIKELY(vm.exception()))
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -167,9 +167,4 @@
</span><span class="cx"> visitor.append(&thisObject->m_boundArgs);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String JSBoundFunction::toStringName(ExecState* exec)
-{
- return m_targetFunction->get(exec, exec->vm().propertyNames->name).toWTFString(exec);
-}
-
</del><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSBoundFunctionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSBoundFunction.h (197814 => 197815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSBoundFunction.h 2016-03-08 23:59:18 UTC (rev 197814)
+++ trunk/Source/JavaScriptCore/runtime/JSBoundFunction.h 2016-03-09 00:01:09 UTC (rev 197815)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> typedef JSFunction Base;
</span><span class="cx"> const static unsigned StructureFlags = ~ImplementsDefaultHasInstance & Base::StructureFlags;
</span><span class="cx">
</span><del>- static JSBoundFunction* create(VM&, ExecState*, JSGlobalObject*, JSObject* targetFunction, JSValue boundThis, JSValue boundArgs, int, const String&);
</del><ins>+ static JSBoundFunction* create(VM&, ExecState*, JSGlobalObject*, JSObject* targetFunction, JSValue boundThis, JSValue boundArgs, int, const String& name);
</ins><span class="cx">
</span><span class="cx"> static bool customHasInstance(JSObject*, ExecState*, JSValue);
</span><span class="cx">
</span><span class="lines">@@ -48,9 +48,7 @@
</span><span class="cx"> JSValue boundThis() { return m_boundThis.get(); }
</span><span class="cx"> JSValue boundArgs() { return m_boundArgs.get(); }
</span><span class="cx">
</span><del>- String toStringName(ExecState*);
-
- static Structure* createStructure(VM& vm, JSGlobalObject* globalObject, JSValue prototype)
</del><ins>+ static Structure* createStructure(VM& vm, JSGlobalObject* globalObject, JSValue prototype)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(globalObject);
</span><span class="cx"> return Structure::create(vm, globalObject, prototype, TypeInfo(JSFunctionType, StructureFlags), info());
</span><span class="lines">@@ -64,7 +62,7 @@
</span><span class="cx"> private:
</span><span class="cx"> JSBoundFunction(VM&, JSGlobalObject*, Structure*, JSObject* targetFunction, JSValue boundThis, JSValue boundArgs);
</span><span class="cx">
</span><del>- void finishCreation(VM&, NativeExecutable*, int, const String&);
</del><ins>+ void finishCreation(VM&, NativeExecutable*, int length, const String& name);
</ins><span class="cx">
</span><span class="cx"> WriteBarrier<JSObject> m_targetFunction;
</span><span class="cx"> WriteBarrier<Unknown> m_boundThis;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSBoundSlotBaseFunctioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSBoundSlotBaseFunction.cpp (197814 => 197815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSBoundSlotBaseFunction.cpp 2016-03-08 23:59:18 UTC (rev 197814)
+++ trunk/Source/JavaScriptCore/runtime/JSBoundSlotBaseFunction.cpp 2016-03-09 00:01:09 UTC (rev 197815)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> if (!getter)
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><del>- const String& name = boundSlotBaseFunction->name(exec);
</del><ins>+ const String& name = boundSlotBaseFunction->name();
</ins><span class="cx"> return getter(exec, JSValue::encode(exec->thisValue()), PropertyName(Identifier::fromString(exec, name)));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -67,7 +67,8 @@
</span><span class="cx"> JSBoundSlotBaseFunction* function = new (NotNull, allocateCell<JSBoundSlotBaseFunction>(vm.heap)) JSBoundSlotBaseFunction(vm, globalObject, globalObject->boundSlotBaseFunctionStructure(), type);
</span><span class="cx">
</span><span class="cx"> // Can't do this during initialization because getHostFunction might do a GC allocation.
</span><del>- function->finishCreation(vm, executable, boundSlotBase, getterSetter, name);
</del><ins>+ String prefix = (type == Type::Getter) ? "get " : "set ";
+ function->finishCreation(vm, executable, boundSlotBase, getterSetter, makeString(prefix, name));
</ins><span class="cx"> return function;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSCJSValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSCJSValue.cpp (197814 => 197815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSCJSValue.cpp 2016-03-08 23:59:18 UTC (rev 197814)
+++ trunk/Source/JavaScriptCore/runtime/JSCJSValue.cpp 2016-03-09 00:01:09 UTC (rev 197815)
</span><span class="lines">@@ -207,6 +207,7 @@
</span><span class="cx"> if (prototype->attemptToInterceptPutByIndexOnHoleForPrototype(exec, *this, propertyName, value, shouldThrow))
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ if (shouldThrow && !exec->hadException())
</ins><span class="cx"> if (shouldThrow)
</span><span class="cx"> throwTypeError(exec, StrictModeReadonlyPropertyWriteError);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSFunctioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSFunction.cpp (197814 => 197815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSFunction.cpp 2016-03-08 23:59:18 UTC (rev 197814)
+++ trunk/Source/JavaScriptCore/runtime/JSFunction.cpp 2016-03-09 00:01:09 UTC (rev 197815)
</span><span class="lines">@@ -177,9 +177,13 @@
</span><span class="cx"> return m_rareData.get();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String JSFunction::name(ExecState* exec)
</del><ins>+String JSFunction::name()
</ins><span class="cx"> {
</span><del>- return get(exec, exec->vm().propertyNames->name).toWTFString(exec);
</del><ins>+ if (isHostFunction()) {
+ NativeExecutable* executable = jsCast<NativeExecutable*>(this->executable());
+ return executable->name();
+ }
+ return jsExecutable()->name().string();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String JSFunction::displayName(ExecState* exec)
</span><span class="lines">@@ -199,7 +203,7 @@
</span><span class="cx"> if (!explicitName.isEmpty())
</span><span class="cx"> return explicitName;
</span><span class="cx">
</span><del>- const String actualName = name(exec);
</del><ins>+ const String actualName = name();
</ins><span class="cx"> if (!actualName.isEmpty() || isHostOrBuiltinFunction())
</span><span class="cx"> return actualName;
</span><span class="cx">
</span><span class="lines">@@ -589,9 +593,19 @@
</span><span class="cx"> ASSERT(!hasReifiedName());
</span><span class="cx"> ASSERT(!isHostFunction());
</span><span class="cx"> unsigned initialAttributes = DontEnum | ReadOnly;
</span><del>- const Identifier& identifier = exec->propertyNames().name;
- putDirect(vm, identifier, jsString(exec, jsExecutable()->name().string()), initialAttributes);
</del><ins>+ const Identifier& propID = exec->propertyNames().name;
</ins><span class="cx">
</span><ins>+ const Identifier& nameID = jsExecutable()->name();
+ String name = nameID.string();
+ if (name.isEmpty())
+ name = jsExecutable()->ecmaName().string();
+
+ if (jsExecutable()->isGetter())
+ name = makeString("get ", name);
+ else if (jsExecutable()->isSetter())
+ name = makeString("set ", name);
+
+ putDirect(vm, propID, jsString(exec, name), initialAttributes);
</ins><span class="cx"> rareData->setHasReifiedName();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSFunctionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSFunction.h (197814 => 197815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSFunction.h 2016-03-08 23:59:18 UTC (rev 197814)
+++ trunk/Source/JavaScriptCore/runtime/JSFunction.h 2016-03-09 00:01:09 UTC (rev 197815)
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> JS_EXPORT_PRIVATE static JSFunction* createBuiltinFunction(VM&, FunctionExecutable*, JSGlobalObject*);
</span><span class="cx"> static JSFunction* createBuiltinFunction(VM&, FunctionExecutable*, JSGlobalObject*, const String& name);
</span><span class="cx">
</span><del>- JS_EXPORT_PRIVATE String name(ExecState*);
</del><ins>+ JS_EXPORT_PRIVATE String name();
</ins><span class="cx"> JS_EXPORT_PRIVATE String displayName(ExecState*);
</span><span class="cx"> const String calculatedDisplayName(ExecState*);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestses6yaml"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tests/es6.yaml (197814 => 197815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/es6.yaml 2016-03-08 23:59:18 UTC (rev 197814)
+++ trunk/Source/JavaScriptCore/tests/es6.yaml 2016-03-09 00:01:09 UTC (rev 197815)
</span><span class="lines">@@ -791,7 +791,7 @@
</span><span class="cx"> - path: es6/Function_is_subclassable_Function.prototype.call.js
</span><span class="cx"> cmd: runES6 :normal
</span><span class="cx"> - path: es6/function_name_property_accessor_properties.js
</span><del>- cmd: runES6 :fail
</del><ins>+ cmd: runES6 :normal
</ins><span class="cx"> - path: es6/function_name_property_bound_functions.js
</span><span class="cx"> cmd: runES6 :normal
</span><span class="cx"> - path: es6/function_name_property_class_expressions.js
</span><span class="lines">@@ -811,7 +811,7 @@
</span><span class="cx"> - path: es6/function_name_property_variables_class.js
</span><span class="cx"> cmd: runES6 :fail
</span><span class="cx"> - path: es6/function_name_property_variables_function.js
</span><del>- cmd: runES6 :fail
</del><ins>+ cmd: runES6 :normal
</ins><span class="cx"> - path: es6/generators_%GeneratorPrototype%.constructor.js
</span><span class="cx"> cmd: runES6 :normal
</span><span class="cx"> - path: es6/generators_%GeneratorPrototype%.js
</span></span></pre>
</div>
</div>
</body>
</html>