Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 13:21:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset a3ce0ae49d97 (bug 1283634) for mda test failures

Browse Source
This commit is contained in:
Wes Kocher 2016-08-02 13:56:28 -07:00
parent ed11c9125a
commit 603c64c98b
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
js/src/jsapi.cpp
View File

@ -708,7 +708,6 @@ JS_EnterCompartment(JSContext* cx, JSObject* target)
{
AssertHeapIsIdle(cx);
CHECK_REQUEST(cx);
MOZ_ASSERT(!JS::ObjectIsMarkedGray(target));
JSCompartment* oldCompartment = cx->compartment();
cx->enterCompartment(target->compartment());
@ -730,7 +729,6 @@ JSAutoCompartment::JSAutoCompartment(JSContext* cx, JSObject* target
{
AssertHeapIsIdleOrIterating(cx_);
MOZ_GUARD_OBJECT_NOTIFIER_INIT;
MOZ_ASSERT(!JS::ObjectIsMarkedGray(target));
cx_->enterCompartment(target->compartment());
}
@ -741,10 +739,10 @@ JSAutoCompartment::JSAutoCompartment(JSContext* cx, JSScript* target
{
AssertHeapIsIdleOrIterating(cx_);
MOZ_GUARD_OBJECT_NOTIFIER_INIT;
MOZ_ASSERT(!JS::ScriptIsMarkedGray(target));
cx_->enterCompartment(target->compartment());
}
JSAutoCompartment::~JSAutoCompartment()
{
cx_->leaveCompartment(oldCompartment_);
@ -759,7 +757,6 @@ JSAutoNullableCompartment::JSAutoNullableCompartment(JSContext* cx,
AssertHeapIsIdleOrIterating(cx_);
MOZ_GUARD_OBJECT_NOTIFIER_INIT;
if (targetOrNull) {
MOZ_ASSERT(!JS::ObjectIsMarkedGray(targetOrNull));
cx_->enterCompartment(targetOrNull->compartment());
} else {
cx_->enterNullCompartment();

3
js/src/jscntxtinlines.h
View File

@ -68,7 +68,6 @@ class CompartmentChecker
}
void check(JSObject* obj) {
MOZ_ASSERT_IF(obj, IsInsideNursery(obj) || !obj->asTenured().isMarked(gc::GRAY));
if (obj)
check(obj->compartment());
}
@ -84,7 +83,6 @@ class CompartmentChecker
}
void check(JSString* str) {
MOZ_ASSERT(!str->isMarked(gc::GRAY));
if (!str->isAtom())
checkZone(str->zone());
}
@ -119,7 +117,6 @@ class CompartmentChecker
void check(jsid id) {}
void check(JSScript* script) {
MOZ_ASSERT_IF(script, !script->isMarked(gc::GRAY));
if (script)
check(script->compartment());
}