1341298 - Relax expected module state when resolving modules...
This commit is contained in:
parent
5ba9a7b255
commit
67595763d0
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -0,0 +1,4 @@
|
|||
import "export-circular-nonexisting-binding-2.js";
|
||||
|
||||
export* from "empty.js";
|
||||
export {x} from "empty.js";
|
|
@ -0,0 +1 @@
|
|||
export {x} from "export-circular-nonexisting-binding-1.js";
|
|
@ -0,0 +1,3 @@
|
|||
// |jit-test| module; error:SyntaxError
|
||||
|
||||
import "export-circular-nonexisting-binding-1.js";
|
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue
Block a user