Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-16 23:05:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 995490 - Tracelogger: Don't assert for wrong textId on non-active items, r=till

Browse Source
This commit is contained in:
Hannes Verschore 2014-04-17 12:26:25 +02:00
parent 9142d75178
commit a45fae84ce
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/src/vm/TraceLogging.cpp
View File

@ -703,8 +703,8 @@ TraceLogger::stopEvent(uint32_t id)
{
#ifdef DEBUG
TreeEntry entry;
MOZ_ASSERT(getTreeEntry(stack.current().treeId(), &entry));
MOZ_ASSERT(entry.textId() == id);
MOZ_ASSERT_IF(stack.current().active(), getTreeEntry(stack.current().treeId(), &entry));
MOZ_ASSERT_IF(stack.current().active(), entry.textId() == id);
#endif
stopEvent();
}

4
js/src/vm/TraceLogging.h
View File

@ -306,7 +306,7 @@ class TraceLogger
stop_ = stop;
}
void setTextId(uint32_t textId) {
MOZ_ASSERT(textId < (1<<31) );
MOZ_ASSERT(textId < uint32_t(1<<31) );
u.s.textId_ = textId;
}
void setHasChildren(bool hasChildren) {
@ -352,7 +352,7 @@ class TraceLogger
lastChildId_ = lastChildId;
}
void setTextId(uint32_t textId) {
MOZ_ASSERT(textId < (1<<31) );
MOZ_ASSERT(textId < uint32_t(1<<31) );
s.textId_ = textId;
}
void setActive(bool active) {