Backed out changeset a8d0c83fe7c7 due to debug-mode assertions in mochitests.
authorJason Orendorff <jorendorff@mozilla.com>
Tue, 20 Jul 2010 11:57:29 -0500
changeset 48510 9241855806513445e2f4cbfa883e064d102d7ddb
parent 48508 a8d0c83fe7c7b9da0d8f86ade122869def3eef00
child 48511 63647e3ee0d513a4a64c36dbd85b8725af9a9e1f
push id14748
push userrsayre@mozilla.com
push dateSun, 01 Aug 2010 00:33:23 +0000
treeherdermozilla-central@f0df797bb2a9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone2.0b2pre
backs outa8d0c83fe7c7b9da0d8f86ade122869def3eef00
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset a8d0c83fe7c7 due to debug-mode assertions in mochitests.
js/src/jscntxt.cpp
--- a/js/src/jscntxt.cpp
+++ b/js/src/jscntxt.cpp
@@ -2082,27 +2082,24 @@ JSContext::popCallStackAndFrame()
 void
 JSContext::saveActiveCallStack()
 {
     JS_ASSERT(hasActiveCallStack());
     currentCallStack->save(fp, regs);
     JS_ASSERT(fp->savedPC == JSStackFrame::sInvalidPC);
     fp->savedPC = regs->pc;
     setCurrentFrame(NULL);
-    compartment = globalObject ? globalObject->getCompartment(this) : runtime->defaultCompartment;
     setCurrentRegs(NULL);
 }
 
 void
 JSContext::restoreCallStack()
 {
     js::CallStack *ccs = currentCallStack;
     setCurrentFrame(ccs->getSuspendedFrame());
-    JSObject *obj = JS_GetGlobalForScopeChain(this);
-    compartment = obj ? obj->getCompartment(this) : runtime->defaultCompartment;
     setCurrentRegs(ccs->getSuspendedRegs());
     ccs->restore();
 #ifdef DEBUG
     fp->savedPC = JSStackFrame::sInvalidPC;
 #endif
 }
 
 JSGenerator *