Cleaner fall-back stack capture for --enable-heap-profiling=native.

base/android/jni_android.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef BASE_ANDROID_JNI_ANDROID_H_
 #define BASE_ANDROID_JNI_ANDROID_H_
 
 #include <jni.h>
 #include <sys/types.h>
 
 #include <string>
 
 #include "base/android/scoped_java_ref.h"
 #include "base/atomicops.h"
 #include "base/base_export.h"
 #include "base/compiler_specific.h"
 #include "base/debug/stack_trace.h"
 #include "base/macros.h"
 
-#if HAVE_TRACE_STACK_FRAME_POINTERS
+#if HAVE_TRACE_STACK_FRAME_POINTERS()
 
 // When profiling is enabled (enable_profiling=true) this macro is added to
 // all generated JNI stubs so that it becomes the last thing that runs before
 // control goes into Java.
 //
 // This macro saves stack frame pointer of the current function. Saved value
 // used later by JNI_LINK_SAVED_FRAME_POINTER.
 #define JNI_SAVE_FRAME_POINTER \
   base::android::JNIStackFrameSaver jni_frame_saver(__builtin_frame_address(0))
 
 // When profiling is enabled (enable_profiling=true) this macro is added to
 // all generated JNI callbacks so that it becomes the first thing that runs
 // after control returns from Java.
 //
 // This macro links stack frame of the current function to the stack frame
 // saved by JNI_SAVE_FRAME_POINTER, allowing frame-based unwinding
 // (used by the heap profiler) to produce complete traces.
 #define JNI_LINK_SAVED_FRAME_POINTER                    \
   base::debug::ScopedStackFrameLinker jni_frame_linker( \
       __builtin_frame_address(0),                       \
       base::android::JNIStackFrameSaver::SavedFrame())
 
 #else
 
 // Frame-based stack unwinding is not supported, do nothing.
 #define JNI_SAVE_FRAME_POINTER
 #define JNI_LINK_SAVED_FRAME_POINTER
 
-#endif  // HAVE_TRACE_STACK_FRAME_POINTERS
+#endif  // HAVE_TRACE_STACK_FRAME_POINTERS()
 
 namespace base {
 namespace android {
 
 // Used to mark symbols to be exported in a shared library's symbol table.
 #define JNI_EXPORT __attribute__ ((visibility("default")))
 
 // The level of JNI registration required for the current process.
 enum JniRegistrationType {
   // Register all native methods.
@@ skipping 99 matching lines @@
 // and returns true.
 BASE_EXPORT bool ClearException(JNIEnv* env);
 
 // This function will call CHECK() macro if there's any pending exception.
 BASE_EXPORT void CheckException(JNIEnv* env);
 
 // This returns a string representation of the java stack trace.
 BASE_EXPORT std::string GetJavaExceptionInfo(JNIEnv* env,
                                              jthrowable java_throwable);
 
-#if HAVE_TRACE_STACK_FRAME_POINTERS
+#if HAVE_TRACE_STACK_FRAME_POINTERS()
 
 // Saves caller's PC and stack frame in a thread-local variable.
 // Implemented only when profiling is enabled (enable_profiling=true).
 class BASE_EXPORT JNIStackFrameSaver {
  public:
   JNIStackFrameSaver(void* current_fp);
   ~JNIStackFrameSaver();
   static void* SavedFrame();
 
  private:
   void* previous_fp_;
 
   DISALLOW_COPY_AND_ASSIGN(JNIStackFrameSaver);
 };
 
-#endif  // HAVE_TRACE_STACK_FRAME_POINTERS
+#endif  // HAVE_TRACE_STACK_FRAME_POINTERS()
 
 }  // namespace android
 }  // namespace base
 
 #endif  // BASE_ANDROID_JNI_ANDROID_H_