Bug 1300515: TraceLogger - Ignore debug checks when stack is empty, r=bbouvier

This commit is contained in:
Hannes Verschore 2016-09-08 17:00:18 +02:00
parent 71cd730292
commit f818d84ee1
2 changed files with 16 additions and 1 deletions

View File

@ -0,0 +1,15 @@
function test1() {
test();
}
function test() {
var du = new Debugger();
du.setupTraceLoggerScriptCalls();
du.startTraceLogger();
}
var du = new Debugger();
if (typeof du.setupTraceLoggerScriptCalls == "function")
test1();

View File

@ -533,7 +533,7 @@ TraceLoggerThread::stopEvent(uint32_t id)
return;
#ifdef DEBUG
if (enabled_ > 0) {
if (enabled_ > 0 && !graphStack.empty()) {
uint32_t prev = graphStack.popCopy();
if (id == TraceLogger_Engine) {
MOZ_ASSERT(prev == TraceLogger_IonMonkey || prev == TraceLogger_Baseline ||