wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-31 11:37:30 +09:00
Code Issues Projects Releases Packages Wiki Activity

Bug 1341298 - Relax expected module state when resolving modules and circular module dependencies are present

Browse source
This commit is contained in:
janekptacijarabaci 2018-04-14 09:02:03 +02:00 • committed by Roy Tam
commit 67f5e5d20c
5 changed files with 15 additions and 5 deletions
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);
}
}