Revert 126020 - Experiment for updating the tcmalloc chromium branch to r144 (gperftools 2.0).

third_party/tcmalloc/chromium/src/stacktrace_powerpc-inl.h

 // Copyright (c) 2007, Google Inc.
 // All rights reserved.
 // 
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 // 
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
@@ skipping 25 matching lines @@
 //    http://www.linux-foundation.org/spec/ELF/ppc64/PPC-elf64abi-1.9.html#STACK
 // Linux has similar code: http://patchwork.ozlabs.org/linuxppc/patch?id=8882
 
 #ifndef BASE_STACKTRACE_POWERPC_INL_H_
 #define BASE_STACKTRACE_POWERPC_INL_H_
 // Note: this file is included into stacktrace.cc more than once.
 // Anything that should only be defined once should be here:
 
 #include <stdint.h>   // for uintptr_t
 #include <stdlib.h>   // for NULL
-#include <gperftools/stacktrace.h>
+#include <google/stacktrace.h>
 
 // Given a pointer to a stack frame, locate and return the calling
 // stackframe, or return NULL if no stackframe can be found. Perform sanity
 // checks (the strictness of which is controlled by the boolean parameter
 // "STRICT_UNWINDING") to reduce the chance that a bad pointer is returned.
 template<bool STRICT_UNWINDING>
 static void **NextStackFrame(void **old_sp) {
   void **new_sp = (void **) *old_sp;
 
   // Check that the transition from frame pointer old_sp to frame
@@ skipping 62 matching lines @@
   // we did, the list of stack frames wouldn't properly match up with
   // the list of return addresses.  Note this means the top pc entry
   // is probably bogus for linux/ppc (and other SYSV-ABI systems).
 #else
   // The LR save area is used by the callee, so the top entry is bogus.
   skip_count++;
 #endif
 
   int n = 0;
   while (sp && n < max_depth) {
+#if IS_STACK_FRAMES
     // The GetStackFrames routine is called when we are in some
     // informational context (the failure signal handler for example).
     // Use the non-strict unwinding rules to produce a stack trace
-    // that is as complete as possible (even if it contains a few
-    // bogus entries in some rare cases).
-    void **next_sp = NextStackFrame<!IS_STACK_FRAMES>(sp);
+    // that is as complete as possible (even if it contains a few bogus
+    // entries in some rare cases).
+    void **next_sp = NextStackFrame<false>(sp);
+#else
+    void **next_sp = NextStackFrame<true>(sp);
+#endif
 
     if (skip_count > 0) {
       skip_count--;
     } else {
       // PowerPC has 3 main ABIs, which say where in the stack the
       // Link Register is.  For DARWIN and AIX (used by apple and
       // linux ppc64), it's in sp[2].  For SYSV (used by linux ppc),
       // it's in sp[1].
 #if defined(_CALL_AIX) || defined(_CALL_DARWIN)
-      result[n] = *(sp+2);
+      result[n++] = *(sp+2);
 #elif defined(_CALL_SYSV)
-      result[n] = *(sp+1);
+      result[n++] = *(sp+1);
 #elif defined(__APPLE__) || (defined(__linux) && defined(__PPC64__))
       // This check is in case the compiler doesn't define _CALL_AIX/etc.
-      result[n] = *(sp+2);
+      result[n++] = *(sp+2);
 #elif defined(__linux)
       // This check is in case the compiler doesn't define _CALL_SYSV.
-      result[n] = *(sp+1);
+      result[n++] = *(sp+1);
 #else
 #error Need to specify the PPC ABI for your archiecture.
 #endif
 
-#if IS_STACK_FRAMES
+#if IS_STACK_FRAME
       if (next_sp > sp) {
         sizes[n] = (uintptr_t)next_sp - (uintptr_t)sp;
       } else {
         // A frame-size of 0 is used to indicate unknown frame size.
         sizes[n] = 0;
       }
 #endif
-      n++;
     }
     sp = next_sp;
   }
   return n;
 }