Backed out changeset 26d55e902ada (bug 1130367) for xpcshell failures

mozilla · Feb 24, 2015 · 5a04044 · 5a04044
1 parent b183534
commit 5a04044
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/js/src/builtin/TestingFunctions.cpp b/js/src/builtin/TestingFunctions.cpp
@@ -1245,11 +1245,8 @@ ReadSPSProfilingStack(JSContext *cx, unsigned argc, jsval *vp)
     CallArgs args = CallArgsFromVp(argc, vp);
     args.rval().setUndefined();
 
-    // Return boolean 'false' if profiler is not enabled.
-    if (!cx->runtime()->spsProfiler.enabled()) {
+    if (!cx->runtime()->spsProfiler.enabled())
         args.rval().setBoolean(false);
-        return true;
-    }
 
     // Array holding physical jit stack frames.
     RootedObject stack(cx, NewDenseEmptyArray(cx));

diff --git a/js/src/vm/Stack.cpp b/js/src/vm/Stack.cpp
@@ -1719,9 +1719,6 @@ JS::ProfilingFrameIterator::ProfilingFrameIterator(JSRuntime *rt, const Register
     activation_(rt->profilingActivation()),
     savedPrevJitTop_(nullptr)
 {
-    // Should only be instantiated when profiling is enabled.
-    MOZ_ASSERT(rt_->spsProfiler.enabled());
-
     if (!activation_)
         return;