Changeset 197867 in webkit for trunk/Source/JavaScriptCore/runtime/Executable.h

Timestamp:

Mar 9, 2016, 11:36:21 AM (9 years ago)

Author:

[email protected]

Message:

FunctionExecutable::ecmaName() should not be based on inferredName().
​https://bugs.webkit.org/show_bug.cgi?id=155203

Reviewed by Michael Saboff.

Source/JavaScriptCore:

The ES6 rules for how a function name should be inferred closely matches JSC's
implementation with one exception:

var o = {}
o.foo = function() {}

JSC's inferredName for o.foo would be "foo".
ES6 specifies that o.foo.name is "".

The fix is to add a distinct FunctionExecutable::ecmaName() which applies the ES6
rules for inferring the initial value of Function.name.

• bytecode/UnlinkedFunctionExecutable.cpp:

(JSC::UnlinkedFunctionExecutable::UnlinkedFunctionExecutable):

• bytecode/UnlinkedFunctionExecutable.h:
• parser/ASTBuilder.h:

(JSC::ASTBuilder::createAssignResolve):
(JSC::ASTBuilder::createGetterOrSetterProperty):
(JSC::ASTBuilder::createProperty):
(JSC::ASTBuilder::makeAssignNode):

• parser/Nodes.h:
• runtime/Executable.h:
• runtime/JSFunction.cpp:

(JSC::JSFunction::reifyName):

• tests/es6.yaml:

LayoutTests:

• js/script-tests/function-toString-vs-name.js:
• Fixed up object property test section and added new test cases.
• platform/mac/http/tests/media/media-source/mediasource-sourcebuffer-mode-expected.txt:

File:

• trunk/Source/JavaScriptCore/runtime/Executable.h (modified) (1 diff)

trunk/Source/JavaScriptCore/runtime/Executable.h

@@ -669 +669 @@
     bool isClassConstructorFunction() const { return m_unlinkedExecutable->isClassConstructorFunction(); }
     const Identifier& name() { return m_unlinkedExecutable->name(); }
+    const Identifier& ecmaName() { return m_unlinkedExecutable->ecmaName(); }
     const Identifier& inferredName() { return m_unlinkedExecutable->inferredName(); }
-    // 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(); }
     size_t parameterCount() const { return m_unlinkedExecutable->parameterCount(); } // Excluding 'this'!
     SourceParseMode parseMode() const { return m_unlinkedExecutable->parseMode(); }