Feodor2
/
Mypal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1341298 - Relax expected module state when resolving modules...

master
Fedor 2019-12-25 15:40:23 +03:00
parent 5ba9a7b255
commit 67595763d0
5 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js/src/builtin/Module.js
View File

@ -100,7 +100,7 @@ function ModuleResolveExport(exportName, resolveSet = [])
let e = indirectExportEntries[i];
if (exportName === e.exportName) {
let importedModule = CallModuleResolveHook(module, e.moduleRequest,
MODULE_STATE_INSTANTIATED);
MODULE_STATE_PARSED);
return callFunction(importedModule.resolveExport, importedModule, e.importName,
resolveSet);
}
@ -120,7 +120,7 @@ function ModuleResolveExport(exportName, resolveSet = [])
for (let i = 0; i < starExportEntries.length; i++) {
let e = starExportEntries[i];
let importedModule = CallModuleResolveHook(module, e.moduleRequest,
MODULE_STATE_INSTANTIATED);
MODULE_STATE_PARSED);
let resolution = callFunction(importedModule.resolveExport, importedModule,
exportName, resolveSet);
if (resolution === "ambiguous")
@ -205,8 +205,8 @@ function GetModuleEnvironment(module)
function RecordInstantationFailure(module)
{
// Set the module's environment slot to 'null' to indicate a failed module
// instantiation.
// Set the module's state to 'failed' to indicate a failed module
// instantiation and reset the environment slot to 'undefined'.
assert(IsModule(module), "Non-module passed to RecordInstantationFailure");
SetModuleState(module, MODULE_STATE_FAILED);
UnsafeSetReservedSlot(module, MODULE_OBJECT_ENVIRONMENT_SLOT, undefined);
@ -267,6 +267,8 @@ function ModuleDeclarationInstantiation()
ThrowSyntaxError(JSMSG_MISSING_IMPORT, imp.importName);
if (resolution === "ambiguous")
ThrowSyntaxError(JSMSG_AMBIGUOUS_IMPORT, imp.importName);
if (resolution.module.state < MODULE_STATE_INSTANTIATED)
ThrowInternalError(JSMSG_BAD_MODULE_STATE);
CreateImportBinding(env, imp.localName, resolution.module, resolution.bindingName);
}
}

4
js/src/jit-test/modules/export-circular-nonexisting-binding-1.js Normal file
View File

@ -0,0 +1,4 @@
import "export-circular-nonexisting-binding-2.js";
export* from "empty.js";
export {x} from "empty.js";

1
js/src/jit-test/modules/export-circular-nonexisting-binding-2.js Normal file
View File

@ -0,0 +1 @@
export {x} from "export-circular-nonexisting-binding-1.js";

3
js/src/jit-test/tests/modules/export-circular-nonexisting-binding.js Normal file
View File

@ -0,0 +1,3 @@
// |jit-test| module; error:SyntaxError
import "export-circular-nonexisting-binding-1.js";

2
js/src/vm/EnvironmentObject.cpp
View File

@ -491,7 +491,7 @@ ModuleEnvironmentObject::createImportBinding(JSContext* cx, HandleAtom importNam
{
RootedId importNameId(cx, AtomToId(importName));
RootedId localNameId(cx, AtomToId(localName));
RootedModuleEnvironmentObject env(cx, module->environment());
RootedModuleEnvironmentObject env(cx, &module->initialEnvironment());
if (!importBindings().putNew(cx, importNameId, env, localNameId)) {
ReportOutOfMemory(cx);
return false;