wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1072903 - TraceLogger: Part 1.5: Fix iterations of stack when getting enabled, r=nbp

Browse Source
This commit is contained in:
Hannes Verschore 2014-11-20 17:43:59 +01:00
parent b2135c55a1
commit 80ed65ff48
1 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -193,9 +193,8 @@ TraceLogger::enable(JSContext *cx)
if (enabled == 1) {
// Get the top Activation to log the top script/pc (No inlined frames).
Activation *act = cx->mainThread().activation();
while (act && (act->cx() != cx || (act->isJit() && !act->asJit()->isActive())))
act = act->prev();
ActivationIterator iter(cx->runtime());
Activation *act = iter.activation();
if (!act) {
failed = true;
@ -207,27 +206,13 @@ TraceLogger::enable(JSContext *cx)
int32_t engine = 0;
if (act->isJit()) {
JSRuntime *rt = cx->runtime();
JitFrameIterator it(iter);
JitFrameIterator it(rt->mainThread.jitTop, SequentialExecution);
MOZ_ASSERT(it.type() == JitFrame_Exit);
++it;
if (it.type() == JitFrame_Rectifier ||
it.type() == JitFrame_Unwound_Rectifier)
{
while (!it.isScripted() && !it.done())
++it;
MOZ_ASSERT(it.type() == JitFrame_BaselineStub ||
it.type() == JitFrame_BaselineJS ||
it.type() == JitFrame_IonJS);
}
if (it.type() == JitFrame_BaselineStub ||
it.type() == JitFrame_Unwound_BaselineStub)
{
++it;
MOZ_ASSERT(it.type() == JitFrame_BaselineJS);
}
MOZ_ASSERT(!it.done());
MOZ_ASSERT(it.isIonJS() || it.isBaselineJS());
script = it.script();
engine = it.isIonJS() ? IonMonkey : Baseline;