Changeset 267186 in webkit for trunk/Source/JavaScriptCore/parser/Parser.cpp

Timestamp:

Sep 17, 2020, 3:30:19 AM (5 years ago)

Author:

[email protected]

Message:

Support export namespace export * as ns
​https://bugs.webkit.org/show_bug.cgi?id=214379

Reviewed by Ross Kirsling.

JSTests:

• stress/modules-syntax-error.js:
• stress/modules-syntax.js:
• test262/expectations.yaml:

Source/JavaScriptCore:

This patch supports export * as ns from "module" syntax. If it is used, we expose "module"'s namespace object as "ns".
For each module environment, we create *namespace* (starNamespace) private symbol scope variable. And we fill it later
with module namespace object. This way allows us to use module namespace object IC and super fast imported module binding
lookup though environment variable lookup mechanism.

• builtins/BuiltinNames.h:
• bytecompiler/BytecodeGenerator.cpp:

(JSC::BytecodeGenerator::BytecodeGenerator):

• parser/NodesAnalyzeModule.cpp:

(JSC::ExportNamedDeclarationNode::analyzeModule):

• parser/Parser.cpp:

(JSC::Parser<LexerType>::parseExportDeclaration):

• runtime/AbstractModuleRecord.cpp:

(JSC::AbstractModuleRecord::ExportEntry::createNamespace):
(JSC::AbstractModuleRecord::resolveExportImpl):
(JSC::AbstractModuleRecord::getModuleNamespace):
(JSC::AbstractModuleRecord::setModuleEnvironment):
(JSC::AbstractModuleRecord::dump):

• runtime/AbstractModuleRecord.h:
• runtime/CommonIdentifiers.h:
• runtime/JSFunction.cpp:

(JSC::JSFunction::name):
(JSC::JSFunction::reifyName):

• runtime/JSModuleNamespaceObject.cpp:

(JSC::JSModuleNamespaceObject::getOwnPropertySlotCommon):

• runtime/JSModuleRecord.cpp:

(JSC::JSModuleRecord::instantiateDeclarations):
(JSC::JSModuleRecord::evaluate):

• wasm/js/JSWebAssemblyModule.cpp:

(JSC::JSWebAssemblyModule::finishCreation):

• wasm/js/WebAssemblyModuleRecord.cpp:

(JSC::WebAssemblyModuleRecord::link):

File:

• trunk/Source/JavaScriptCore/parser/Parser.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/parser/Parser.cpp

@@ -3532 +3532 @@
     case TIMES: {
         // export * FromClause ;
-        next();
+        // export * as IdentifierName FromClause ;
+        next();
+
+        const Identifier* exportedName = nullptr;
+        JSTokenLocation specifierLocation;
+        if (matchContextualKeyword(m_vm.propertyNames->as)) {
+            next();
+            specifierLocation = JSTokenLocation(tokenLocation());
+            failIfFalse(matchIdentifierOrKeyword(), "Expected an exported name for the export declaration");
+            exportedName = m_token.m_data.ident;
+            next();
+        }
 
         failIfFalse(matchContextualKeyword(m_vm.propertyNames->from), "Expected 'from' before exported module name");
@@ -3539 +3550 @@
         failIfFalse(moduleName, "Cannot parse the 'from' clause");
         failIfFalse(autoSemiColon(), "Expected a ';' following a targeted export declaration");
+
+        if (exportedName) {
+            semanticFailIfFalse(exportName(*exportedName), "Cannot export a duplicate name '", exportedName->impl(), "'");
+            auto specifierList = context.createExportSpecifierList();
+            auto localName = &m_vm.propertyNames->starNamespacePrivateName;
+            auto specifier = context.createExportSpecifier(specifierLocation, *localName, *exportedName);
+            context.appendExportSpecifier(specifierList, specifier);
+            return context.createExportNamedDeclaration(exportLocation, specifierList, moduleName);
+        }
 
         return context.createExportAllDeclaration(exportLocation, moduleName);