Changeset 196243 in webkit

Timestamp:

Feb 7, 2016 3:16:20 PM (8 years ago)

Author:

sbarati@apple.com

Message:

Source/JavaScriptCore:
Follow up patch to: [ES6] bound functions .name property should be "bound " + the target function's name
​https://bugs.webkit.org/show_bug.cgi?id=153796

Reviewed by Darin Adler.

This follow-up patch addresses some comments/suggestions by
Ryosuke, Darin, and Joe. It simplifies JSBoundFunction::toStringName
and adds some tests for bound names.

• runtime/JSBoundFunction.cpp:

(JSC::hasInstanceBoundFunction):
(JSC::JSBoundFunction::create):
(JSC::JSBoundFunction::toStringName):

LayoutTests:
[ES6] bound functions .name property should be "bound " + the target function's name
​https://bugs.webkit.org/show_bug.cgi?id=153796

Reviewed by Darin Adler.

• js/bound-function-name-expected.txt: Added.
• js/bound-function-name.html: Added.
• js/script-tests/bound-function-name.js: Added.

(assert):
(assert.foo):
(bar):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/js/bound-function-name-expected.txt (added)
• LayoutTests/js/bound-function-name.html (added)
• LayoutTests/js/script-tests/bound-function-name.js (added)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/runtime/JSBoundFunction.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-02-07  Saam barati  <sbarati@apple.com>
+
+        [ES6] bound functions .name property should be "bound " + the target function's name
+        https://bugs.webkit.org/show_bug.cgi?id=153796
+
+        Reviewed by Darin Adler.
+
+        * js/bound-function-name-expected.txt: Added.
+        * js/bound-function-name.html: Added.
+        * js/script-tests/bound-function-name.js: Added.
+        (assert):
+        (assert.foo):
+        (bar):
+
 2016-02-07  Daniel Bates  <dabates@apple.com>
 

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2016-02-07  Saam barati  <sbarati@apple.com>
+
+        Follow up patch to: [ES6] bound functions .name property should be "bound " + the target function's name 
+        https://bugs.webkit.org/show_bug.cgi?id=153796
+
+        Reviewed by Darin Adler.
+
+        This follow-up patch addresses some comments/suggestions by
+        Ryosuke, Darin, and Joe. It simplifies JSBoundFunction::toStringName
+        and adds some tests for bound names.
+
+        * runtime/JSBoundFunction.cpp:
+        (JSC::hasInstanceBoundFunction):
+        (JSC::JSBoundFunction::create):
+        (JSC::JSBoundFunction::toStringName):
+
 2016-02-07  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/JavaScriptCore/runtime/JSBoundFunction.cpp

@@ -88 +88 @@
 }
 
-static const char* const boundPrefix = "bound ";
-
 JSBoundFunction* JSBoundFunction::create(VM& vm, JSGlobalObject* globalObject, JSObject* targetFunction, JSValue boundThis, JSValue boundArgs, int length, const String& name)
 {
@@ -98 +96 @@
     JSBoundFunction* function = new (NotNull, allocateCell<JSBoundFunction>(vm.heap)) JSBoundFunction(vm, globalObject, globalObject->boundFunctionStructure(), targetFunction, boundThis, boundArgs);
 
-    function->finishCreation(vm, executable, length, makeString(ASCIILiteral(boundPrefix), name));
+    function->finishCreation(vm, executable, length, makeString("bound ", name));
     return function;
 }
@@ -137 +135 @@
 String JSBoundFunction::toStringName(ExecState* exec)
 {
-    String result = name(exec);
-    ASSERT(result.find(ASCIILiteral(boundPrefix)) == 0);
-    static const size_t boundPrefixLength = 6;
-    return result.substring(boundPrefixLength);
+    return m_targetFunction->get(exec, exec->vm().propertyNames->name).toWTFString(exec);
 }