Merge branch 'redwood' into releaseRELBASE_20200831

1 files changed, 4 insertions, 8 deletions

diff --git a/js/src/jit-test/tests/modules/bug-1284486.js b/js/src/jit-test/tests/modules/bug-1284486.js
index 08286393a..6fbd67d9d 100644
--- a/js/src/jit-test/tests/modules/bug-1284486.js
+++ b/js/src/jit-test/tests/modules/bug-1284486.js
@@ -1,9 +1,8 @@
-// This tests that attempting to perform ModuleDeclarationInstantation a second
-// time after a failure re-throws the same error.
+// This tests that module instantiation can succeed when executed a second

+// time after a failure.
 //
 // The first attempt fails becuase module 'a' is not available. The second
-// attempt fails because of the previous failure (it would otherwise succeed as
-// 'a' is now available).
+// attempt succeeds as 'a' is now available.
 
 load(libdir + "dummyModuleResolveHook.js");
 
@@ -25,12 +24,9 @@ let a = moduleRepo['a'] = parseModule("export var a = 1; export var b = 2;");
 let d = moduleRepo['d'] = parseModule("import { a } from 'c'; a;");
 
 threw = false;
-let e2;
 try {
     d.declarationInstantiation();
 } catch (exc) {
     threw = true;
-    e2 = exc;
 }
-assertEq(threw, true);
-assertEq(e1, e2);
+assertEq(threw, false);