--- a/tools/profiler/TableTicker.cpp
+++ b/tools/profiler/TableTicker.cpp
@@ -796,48 +796,43 @@ void StackWalkCallback(void* aPC, void* 
     // too many frames, ignore
     return;
   }
   array->sp_array[array->count] = aSP;
   array->array[array->count] = aPC;
   array->count++;
 }
 
-static void doMergeBacktrace(ThreadProfile &aProfile, TickSample* aSample, void* aThread)
+void TableTicker::doBacktrace(ThreadProfile &aProfile, TickSample* aSample)
 {
+#ifndef XP_MACOSX
+  uintptr_t thread = GetThreadHandle(platform_data());
+  MOZ_ASSERT(thread);
+#endif
   void* pc_array[1000];
   void* sp_array[1000];
   PCArray array = {
     pc_array,
     sp_array,
     mozilla::ArrayLength(pc_array),
     0
   };
 
   // Start with the current function.
   StackWalkCallback(aSample->pc, aSample->sp, &array);
 
 #ifdef XP_MACOSX
-  pthread_t pt;
-  if (aThread) {
-    pt = (pthread_t)aThread;
-  } else {
-    pt = pthread_self();
-  }
-
+  pthread_t pt = GetProfiledThread(platform_data());
   void *stackEnd = reinterpret_cast<void*>(-1);
   if (pt)
     stackEnd = static_cast<char*>(pthread_get_stackaddr_np(pt));
   nsresult rv = NS_OK;
   if (aSample->fp >= aSample->sp && aSample->fp <= stackEnd)
     rv = FramePointerStackWalk(StackWalkCallback, 0, &array, reinterpret_cast<void**>(aSample->fp), stackEnd);
 #else
-  uintptr_t thread = (uintptr_t)aThread;
-  GetThreadHandle(platform_data());
-  MOZ_ASSERT(thread);
   nsresult rv = NS_StackWalk(StackWalkCallback, 0, &array, thread);
 #endif
   if (NS_SUCCEEDED(rv)) {
     aProfile.addTag(ProfileEntry('s', "(root)"));
 
     ProfileStack* stack = aProfile.GetStack();
     int pseudoStackPos = 0;
 
@@ -869,26 +864,16 @@ static void doMergeBacktrace(ThreadProfi
         addProfileEntry(entry, aProfile, stack, array.array[0]);
         pseudoStackPos++;
       }
 
       aProfile.addTag(ProfileEntry('l', (void*)array.array[i-1]));
     }
   }
 }
-
-void TableTicker::doBacktrace(ThreadProfile &aProfile, TickSample* aSample)
-{
-#ifdef XP_MACOSX
-  doMergeBacktrace(aProfile, aSample, GetProfiledThread(platform_data()));
-#else
-  doMergeBacktrace(aProfile, aSample, GetThreadHandle(platform_data()));
-#endif
-}
-
 #endif
 
 #if defined(USE_LIBUNWIND) && defined(ANDROID)
 void TableTicker::doBacktrace(ThreadProfile &aProfile, TickSample* aSample)
 {
   void* pc_array[1000];
   size_t count = 0;
 
@@ -1275,61 +1260,30 @@ void mozilla_sampler_frame_number(int fr
   sFrameNumber = frameNumber;
 }
 
 void print_callback(const ProfileEntry& entry, const char* tagStringData) {
   switch (entry.mTagName) {
     case 's':
     case 'c':
       printf_stderr("  %s\n", tagStringData);
-      break;
-    case 'l':
-      unsigned long long pc = (unsigned long long)(uintptr_t)entry.mTagPtr;
-      nsCodeAddressDetails details;
-      NS_DescribeCodeAddress((void*)pc, &details);
-      if (details.function) {
-        printf_stderr("  %s\n", details.function);
-      } else {
-        printf_stderr("  %#llx\n", pc);
-      }
-      break;
   }
 }
 
 void mozilla_sampler_print_location()
 {
   if (!stack_key_initialized)
     mozilla_sampler_init();
 
   ProfileStack *stack = tlsStack.get();
   if (!stack) {
     MOZ_ASSERT(false);
     return;
   }
 
-  ThreadProfile threadProfile(2000, stack);
-#ifdef USE_NS_STACKWALK
-  // Get the frame pointer
-  void **bp;
-#if defined(__i386)
-  __asm__( "movl %%ebp, %0" : "=g"(bp));
-#else
-  // It would be nice if this worked uniformly, but at least on i386 and
-  // x86_64, it stopped working with gcc 4.1, because it points to the
-  // end of the saved registers instead of the start.
-  bp = (void**) __builtin_frame_address(0);
-#endif
-
-  TickSample sample;
-  sample.fp = (unsigned char*)bp;
-  sample.pc = nullptr;
-  sample.sp = (unsigned char*)&stack;
-
-  doMergeBacktrace(threadProfile, &sample, 0);
-#else
+  ThreadProfile threadProfile(1000, stack);
   doSampleStackTrace(stack, threadProfile, NULL);
-#endif
 
   threadProfile.flush();
 
   printf_stderr("Backtrace:\n");
   threadProfile.IterateTags(print_callback);
 }