diff options
| author | Moonchild <moonchild@palemoon.org> | 2020-08-04 08:51:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-04 08:51:51 +0200 |
| commit | 501b29a5df925f2de3c0a1343290982e5ff6f829 (patch) | |
| tree | f7359e9879c71d7da3e18638ee312e3ae204dfe3 /js | |
| parent | 8447c4d8a3c8e8a80c83de99dc71d64a39d6fa83 (diff) | |
| parent | c5b47eb66c75642ded54474f3f559ff83c129c09 (diff) | |
| download | UXP-501b29a5df925f2de3c0a1343290982e5ff6f829.tar UXP-501b29a5df925f2de3c0a1343290982e5ff6f829.tar.gz UXP-501b29a5df925f2de3c0a1343290982e5ff6f829.tar.lz UXP-501b29a5df925f2de3c0a1343290982e5ff6f829.tar.xz UXP-501b29a5df925f2de3c0a1343290982e5ff6f829.zip | |
Merge pull request #1626 from g4jc/618
Fix debug build issues on es-modules-work branch
Diffstat (limited to 'js')
| -rw-r--r-- | js/src/builtin/Module.js | 3 | ||||
| -rw-r--r-- | js/src/builtin/ModuleObject.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/js/src/builtin/Module.js b/js/src/builtin/Module.js index c9f20c18c..355303d44 100644 --- a/js/src/builtin/Module.js +++ b/js/src/builtin/Module.js @@ -67,7 +67,8 @@ function ModuleGetExportedNames(exportStarSet = []) function ModuleSetStatus(module, newStatus) { - assert(newStatus >= MODULE_STATUS_ERRORED && newStatus <= MODULE_STATUS_EVALUATED, + assert(newStatus >= MODULE_STATUS_UNINSTANTIATED && + newStatus <= MODULE_STATUS_EVALUATED_ERROR, "Bad new module status in ModuleSetStatus"); // Note that under OOM conditions we can fail the module instantiation diff --git a/js/src/builtin/ModuleObject.cpp b/js/src/builtin/ModuleObject.cpp index 44e5a2c88..728929e8c 100644 --- a/js/src/builtin/ModuleObject.cpp +++ b/js/src/builtin/ModuleObject.cpp @@ -272,7 +272,7 @@ IndirectBindingMap::put(JSContext* cx, HandleId name, // different zone to the final module. Lazily allocate the map so we don't // have to switch its zone when merging compartments. if (!map_) { - MOZ_ASSERT(!cx->zone()->group()->createdForHelperThread()); + MOZ_ASSERT(!cx->zone()->usedByExclusiveThread); map_.emplace(cx->zone()); if (!map_->init()) { map_.reset(); |