diff options
| author | Gaming4JC <g4jc@hyperbola.info> | 2019-06-28 23:02:15 -0400 |
|---|---|---|
| committer | Gaming4JC <g4jc@hyperbola.info> | 2019-06-28 23:02:15 -0400 |
| commit | 35d29c05c59057fc84be41ec94f2e3bc31ddef44 (patch) | |
| tree | 7f58864f0cd14040d23a64add100eefd8ff6538b /js/src | |
| parent | 01e1fcf522219bf1b2d7d2dcc6209db3d270a182 (diff) | |
| download | uxp-35d29c05c59057fc84be41ec94f2e3bc31ddef44.tar.gz | |
Issue #1142 - Cleanup unused debug code for unboxed objects
Also fixes an assertion during compile if debug is enabled since unboxed objects have been removed.
Diffstat (limited to 'js/src')
| -rw-r--r-- | js/src/jit/BaselineIC.cpp | 2 | ||||
| -rw-r--r-- | js/src/jscompartment.cpp | 7 |
2 files changed, 1 insertions, 8 deletions
diff --git a/js/src/jit/BaselineIC.cpp b/js/src/jit/BaselineIC.cpp index d95d08edcd..2f20ffa4fe 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/jscompartment.cpp b/js/src/jscompartment.cpp index a48bb0ffec..6024a1768f 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--; } |