Bug 1020541 - JS Stacks no longer reported in the profiler, r=benwa,djvj
authorVictor Porof <vporof@mozilla.com>
Tue, 24 Jun 2014 21:46:13 -0400
changeset 190692 9ab9f3f22d1c61f2ab0db0d1f22a296c74613a16
parent 190691 bb723b1668ecd2f86666e4ccdd9ca58f3010a518
child 190693 facfd4c4d77b257e0a2f736684747b72f4089e71
push id8358
push usercbook@mozilla.com
push dateWed, 25 Jun 2014 14:22:36 +0000
treeherderb2g-inbound@56ebaa70ca72 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbenwa, djvj
bugs1020541
milestone33.0a1
Bug 1020541 - JS Stacks no longer reported in the profiler, r=benwa,djvj
tools/profiler/TableTicker.cpp
--- a/tools/profiler/TableTicker.cpp
+++ b/tools/profiler/TableTicker.cpp
@@ -419,17 +419,17 @@ static void mergeNativeBacktrace(ThreadP
    */
   // i is the index in C stack starting at main and decreasing
   // pseudoStackPos is the position in the Pseudo stack starting
   // at the first frame (run_js in the example) and increasing.
   for (size_t i = array.count; i > 0; --i) {
     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]);
       pseudoStackPos++;
     }
 
     aProfile.addTag(ProfileEntry('l', (void*)array.array[i-1]));
   }