diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-06-29 23:01:30 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-06-29 23:01:30 +0200 |
| commit | 562326d0c25838bcf6e3a302ad3181e8a68f8e3c (patch) | |
| tree | 95057f6ac6f23346f0c795b5d129c745647aa1ef /js/src | |
| parent | eb71020782b0c0bb6a128496010f1bb926625370 (diff) | |
| parent | 98f7e3b16754aedd44747261113359b8d824449f (diff) | |
| download | UXP-562326d0c25838bcf6e3a302ad3181e8a68f8e3c.tar UXP-562326d0c25838bcf6e3a302ad3181e8a68f8e3c.tar.gz UXP-562326d0c25838bcf6e3a302ad3181e8a68f8e3c.tar.lz UXP-562326d0c25838bcf6e3a302ad3181e8a68f8e3c.tar.xz UXP-562326d0c25838bcf6e3a302ad3181e8a68f8e3c.zip | |
Merge branch 'master' into Pale_Moon-releasePM28.6.0_Release
Diffstat (limited to 'js/src')
| -rw-r--r-- | js/src/jit/BaselineIC.cpp | 2 | ||||
| -rw-r--r-- | js/src/jit/MIR.h | 1 | ||||
| -rw-r--r-- | js/src/jscompartment.cpp | 7 |
3 files changed, 1 insertions, 9 deletions
diff --git a/js/src/jit/BaselineIC.cpp b/js/src/jit/BaselineIC.cpp index d95d08edc..2f20ffa4f 100644 --- a/js/src/jit/BaselineIC.cpp +++ b/js/src/jit/BaselineIC.cpp @@ -289,7 +289,7 @@ DoTypeUpdateFallback(JSContext* cx, BaselineFrame* frame, ICUpdatedStub* stub, H case ICStub::SetProp_Native: case ICStub::SetProp_NativeAdd: case ICStub::SetProp_Unboxed: { - MOZ_ASSERT(obj->isNative() || obj->is<UnboxedPlainObject>()); + MOZ_ASSERT(obj->isNative()); jsbytecode* pc = stub->getChainFallback()->icEntry()->pc(script); if (*pc == JSOP_SETALIASEDVAR || *pc == JSOP_INITALIASEDLEXICAL) id = NameToId(EnvironmentCoordinateName(cx->caches.envCoordinateNameCache, script, pc)); diff --git a/js/src/jit/MIR.h b/js/src/jit/MIR.h index 0992768bf..9076339f1 100644 --- a/js/src/jit/MIR.h +++ b/js/src/jit/MIR.h @@ -3785,7 +3785,6 @@ class MObjectState MOZ_MUST_USE bool initFromTemplateObject(TempAllocator& alloc, MDefinition* undefinedVal); size_t numFixedSlots() const { - MOZ_ASSERT(!isUnboxed()); return numFixedSlots_; } size_t numSlots() const { diff --git a/js/src/jscompartment.cpp b/js/src/jscompartment.cpp index a48bb0ffe..6024a1768 100644 --- a/js/src/jscompartment.cpp +++ b/js/src/jscompartment.cpp @@ -112,13 +112,6 @@ JSCompartment::~JSCompartment() js_delete(nonSyntacticLexicalEnvironments_), js_free(enumerators); -#ifdef DEBUG - // Avoid assertion destroying the unboxed layouts list if the embedding - // leaked GC things. - if (!rt->gc.shutdownCollectedEverything()) - unboxedLayouts.clear(); -#endif - runtime_->numCompartments--; } |