From f857d0aba9264cf5491471a57ed108363a46a5b1 Mon Sep 17 00:00:00 2001 From: Victor Porof Date: Tue, 24 Jun 2014 21:46:13 -0400 Subject: [PATCH] Bug 1020541 - JS Stacks no longer reported in the profiler, r=benwa,djvj --- tools/profiler/TableTicker.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/profiler/TableTicker.cpp b/tools/profiler/TableTicker.cpp index 8cd5342be1ce..91b494d56fa9 100644 --- a/tools/profiler/TableTicker.cpp +++ b/tools/profiler/TableTicker.cpp @@ -424,7 +424,7 @@ static void mergeNativeBacktrace(ThreadProfile &aProfile, const PCArray &array) while (pseudoStackPos < stack->stackSize()) { volatile StackEntry& entry = stack->mStack[pseudoStackPos]; - if (entry.stackAddress() < array.sp_array[i-1] && entry.stackAddress()) + if (entry.isCpp() && entry.stackAddress() && entry.stackAddress() < array.sp_array[i-1]) break; addProfileEntry(entry, aProfile, stack, array.array[0]);