Bug 634436 - Fix bogus profiler assertion in tracer (r=gal)

js/src/jstracer.cpp

@@ -6498,7 +6498,7 @@ TracerState::TracerState(JSContext* cx, TraceMonitor* tm, TreeFragment* f,
     prev = tm->tracerState;
     tm->tracerState = this;
 
-#ifdef JS_METH
+#ifdef JS_METHODJIT
     if (TRACE_PROFILER(cx))
         AbortProfiling(cx);
 #endif
@@ -6627,8 +6627,6 @@ ExecuteTree(JSContext* cx, TraceMonitor* tm, TreeFragment* f, uintN& inlineCallC
 #endif
     JS_ASSERT(f->root == f && f->code());
 
-    JS_ASSERT(!tm->profile);
-
     if (!ScopeChainCheck(cx, f) || !cx->stack().ensureEnoughSpaceToEnterTrace() ||
         inlineCallCount + f->maxCallDepth > JS_MAX_INLINE_CALL_COUNT) {
         *lrp = NULL;