Bug 1016738 - Back out for webrtc crashes.

2014-06-09 12:30:38 -07:00
parent 0087c3b0e9
commit 681e59de19
17 changed files with 158 additions and 116 deletions
--- a/js/src/jsobj.cpp
+++ b/js/src/jsobj.cpp
@@ -2505,6 +2505,9 @@ JSObject::TradeGuts(JSContext *cx, JSObject *a, JSObject *b, TradeGutsReserved &
 bool
 JSObject::swap(JSContext *cx, HandleObject a, HandleObject b)
 {
+    AutoMarkInDeadZone adc1(a->zone());
+    AutoMarkInDeadZone adc2(b->zone());
+
    // Ensure swap doesn't cause a finalizer to not be run.
    JS_ASSERT(IsBackgroundFinalized(a->tenuredGetAllocKind()) ==
              IsBackgroundFinalized(b->tenuredGetAllocKind()));