Changeset 199927 in webkit for trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp

Timestamp:

Apr 22, 2016, 4:04:55 PM (9 years ago)

Author:

[email protected]

Message:

super should be available in object literals
​https://bugs.webkit.org/show_bug.cgi?id=156933

Reviewed by Saam Barati.

Source/JavaScriptCore:

When we originally implemented classes, super seemed to be a class-only
feature. But the final spec says it's available in object literals too.

• bytecompiler/NodesCodegen.cpp:

(JSC::PropertyListNode::emitBytecode): Having 'super' and being a class
property are no longer synonymous, so we track two separate variables.

(JSC::PropertyListNode::emitPutConstantProperty): Being inside the super
branch no longer guarantees that you're a class property, so we decide
our attributes and our function name dynamically.

• parser/ASTBuilder.h:

(JSC::ASTBuilder::createArrowFunctionExpr):
(JSC::ASTBuilder::createGetterOrSetterProperty):
(JSC::ASTBuilder::createArguments):
(JSC::ASTBuilder::createArgumentsList):
(JSC::ASTBuilder::createProperty):
(JSC::ASTBuilder::createPropertyList): Pass through state to indicate
whether we're a class property, since we can't infer it from 'super'
anymore.

• parser/NodeConstructors.h:

(JSC::PropertyNode::PropertyNode): See ASTBuilder.h.

• parser/Nodes.h:

(JSC::PropertyNode::expressionName):
(JSC::PropertyNode::name):
(JSC::PropertyNode::type):
(JSC::PropertyNode::needsSuperBinding):
(JSC::PropertyNode::isClassProperty):
(JSC::PropertyNode::putType): See ASTBuilder.h.

• parser/Parser.cpp:

(JSC::Parser<LexerType>::parseFunctionInfo):
(JSC::Parser<LexerType>::parseClass):
(JSC::Parser<LexerType>::parseProperty):
(JSC::Parser<LexerType>::parsePropertyMethod):
(JSC::Parser<LexerType>::parseGetterSetter):
(JSC::Parser<LexerType>::parseMemberExpression): I made these error
messages generic because it is no longer practical to say concise things
about the list of places you can use super.

• parser/Parser.h:

• parser/SyntaxChecker.h:

(JSC::SyntaxChecker::createArgumentsList):
(JSC::SyntaxChecker::createProperty):
(JSC::SyntaxChecker::appendExportSpecifier):
(JSC::SyntaxChecker::appendConstDecl):
(JSC::SyntaxChecker::createGetterOrSetterProperty): Updated for
interface change.

• tests/stress/generator-with-super.js:

(test):

• tests/stress/modules-syntax-error.js:
• tests/stress/super-in-lexical-scope.js:

(testSyntaxError):
(testSyntaxError.test):

• tests/stress/tagged-templates-syntax.js: Updated for error message

changes. See Parser.cpp.

LayoutTests:

Updated expected results and added a few new tests.

• js/arrowfunction-syntax-errors-expected.txt:
• js/class-syntax-super-expected.txt:
• js/object-literal-methods-expected.txt:
• js/script-tests/arrowfunction-syntax-errors.js:
• js/script-tests/class-syntax-super.js:
• js/script-tests/object-literal-methods.js:

File:

• trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp (modified) (4 diffs)

trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp

@@ -499 +499 @@
 
             RefPtr<RegisterID> value = generator.emitNode(node->m_assign);
-            bool isClassProperty = node->needsSuperBinding();
-            if (isClassProperty)
+            bool needsSuperBinding = node->needsSuperBinding();
+            if (needsSuperBinding)
                 emitPutHomeObject(generator, value.get(), dst);
-            unsigned attribute = isClassProperty ? (Accessor | DontEnum) : Accessor;
+
+            unsigned attributes = node->isClassProperty() ? (Accessor | DontEnum) : Accessor;
 
             ASSERT(node->m_type & (PropertyNode::Getter | PropertyNode::Setter));
@@ -513 +514 @@
                     generator.emitSetFunctionNameIfNeeded(node->m_assign, value.get(), propertyName.get());
                     if (node->m_type & PropertyNode::Getter)
-                        generator.emitPutGetterByVal(dst, propertyName.get(), attribute, value.get());
+                        generator.emitPutGetterByVal(dst, propertyName.get(), attributes, value.get());
                     else
-                        generator.emitPutSetterByVal(dst, propertyName.get(), attribute, value.get());
+                        generator.emitPutSetterByVal(dst, propertyName.get(), attributes, value.get());
                     continue;
                 }
 
                 if (node->m_type & PropertyNode::Getter)
-                    generator.emitPutGetterById(dst, *node->name(), attribute, value.get());
+                    generator.emitPutGetterById(dst, *node->name(), attributes, value.get());
                 else
-                    generator.emitPutSetterById(dst, *node->name(), attribute, value.get());
+                    generator.emitPutSetterById(dst, *node->name(), attributes, value.get());
                 continue;
             }
@@ -563 +564 @@
             }
 
-            ASSERT(!pair.second || isClassProperty == pair.second->needsSuperBinding());
-            if (isClassProperty && pair.second)
+            ASSERT(!pair.second || needsSuperBinding == pair.second->needsSuperBinding());
+            if (needsSuperBinding && pair.second)
                 emitPutHomeObject(generator, secondReg, dst);
 
-            generator.emitPutGetterSetter(dst, *node->name(), attribute, getterReg.get(), setterReg.get());
+            generator.emitPutGetterSetter(dst, *node->name(), attributes, getterReg.get(), setterReg.get());
         }
     }
@@ -586 +587 @@
             propertyNameRegister = generator.emitNode(node.m_expression);
 
+        unsigned attributes = BytecodeGenerator::PropertyConfigurable | BytecodeGenerator::PropertyWritable;
+        if (!node.isClassProperty())
+            attributes |= BytecodeGenerator::PropertyEnumerable;
+        generator.emitSetFunctionNameIfNeeded(node.m_assign, value.get(), propertyNameRegister.get());
         generator.emitCallDefineProperty(newObj, propertyNameRegister.get(),
-            value.get(), nullptr, nullptr, BytecodeGenerator::PropertyConfigurable | BytecodeGenerator::PropertyWritable, m_position);
+            value.get(), nullptr, nullptr, attributes, m_position);
         return;
     }