Bug 1476921 - Don't throw an error in GetModuleNamespace for errored …

…modules. r=jonco

js/src/builtin/Module.js

@@ -188,19 +188,14 @@ function GetModuleNamespace(module)
     // Step 1
     assert(IsObject(module) && IsModule(module), "GetModuleNamespace called with non-module");
 
-    // Until issue https://github.com/tc39/ecma262/issues/1155 is resolved,
-    // violate the spec here and throw if called on an errored module.
-    if (module.status === MODULE_STATUS_EVALUATED_ERROR)
-        throw GetModuleEvaluationError(module);
-
-    // Steps 2-3
+    // Step 2
     assert(module.status !== MODULE_STATUS_UNINSTANTIATED,
            "Bad module state in GetModuleNamespace");
 
-    // Step 4
+    // Step 3
     let namespace = module.namespace;
 
-    // Step 3
+    // Step 4
     if (typeof namespace === "undefined") {
         let exportedNames = callFunction(module.getExportedNames, module);
         let unambiguousNames = new_List();
@@ -213,7 +208,7 @@ function GetModuleNamespace(module)
         namespace = ModuleNamespaceCreate(module, unambiguousNames);
     }
 
-    // Step 4
+    // Step 5
     return namespace;
 }
 

js/src/jit-test/tests/modules/bug-1476921.js

@@ -0,0 +1,19 @@
+"use strict";
+
+load(libdir + "asserts.js");
+load(libdir + "dummyModuleResolveHook.js");
+
+class UniqueError extends Error {}
+
+let a = moduleRepo['a'] = parseModule(`
+    throw new UniqueError();
+`);
+
+let b = moduleRepo['b'] = parseModule(`
+    import * as ns0 from "a";
+`);
+
+a.declarationInstantiation();
+assertThrowsInstanceOf(() => a.evaluation(), UniqueError);
+b.declarationInstantiation();
+assertThrowsInstanceOf(() => b.evaluation(), UniqueError);

js/src/jit-test/tests/modules/bug1449153.js

@@ -32,4 +32,5 @@ assertThrowsMyError(() => c.evaluation());
 let b = moduleRepo['b'] = parseModule(`
     import * as ns0 from 'a'
 `);
-assertThrowsMyError(() => b.declarationInstantiation());
+b.declarationInstantiation();
+assertThrowsMyError(() => b.evaluation(b));