commit 11ea06f490797f0c49b0d87320c92a4db140b283
author Saleem Abdulrasool <compnerd@compnerd.org> Wed Jan 25 02:27:45 2017 +0000
committer Saleem Abdulrasool <compnerd@compnerd.org> Wed Jan 25 02:27:45 2017 +0000
tree 7a8a6ac9ca0063cdf1dc5c915b8ec305079719a8
parent 43a1c58a8f7178556f9ecfaf75b9809adb59dce8

DWARF: fix -Asserts builds

no-op the DWARF tracing macros in non-debug builds.

git-svn-id: https://llvm.org/svn/llvm-project/libunwind/trunk@293008 91177308-0d34-0410-b5e6-96231b3b80d8

src/DwarfParser.hpp

diff --git a/src/DwarfParser.hpp b/src/DwarfParser.hpp
index f4e5d48..610a3ae 100644
--- a/src/DwarfParser.hpp
+++ b/src/DwarfParser.hpp
@@ -22,14 +22,7 @@
 #include "dwarf2.h"
 
 #include "AddressSpace.hpp"
-
-extern "C" bool logDWARF();
-
-#define _LIBUNWIND_TRACE_DWARF(...)                                            \
-  do {                                                                         \
-    if (logDWARF())                                                            \
-      fprintf(stderr, __VA_ARGS__);                                            \
-  } while (0)
+#include "config.h"
 
 namespace libunwind {
 

src/config.h

diff --git a/src/config.h b/src/config.h
index fefb44e..55c3282 100644
--- a/src/config.h
+++ b/src/config.h
@@ -110,13 +110,16 @@
   #define _LIBUNWIND_DEBUG_LOG(msg, ...)
   #define _LIBUNWIND_TRACE_API(msg, ...)
   #define _LIBUNWIND_TRACING_UNWINDING (0)
+  #define _LIBUNWIND_TRACING_DWARF (0)
   #define _LIBUNWIND_TRACE_UNWINDING(msg, ...)
+  #define _LIBUNWIND_TRACE_DWARF(...)
 #else
   #ifdef __cplusplus
     extern "C" {
   #endif
     extern  bool logAPIs();
     extern  bool logUnwinding();
+    extern  bool logDWARF();
   #ifdef __cplusplus
     }
   #endif
@@ -127,11 +130,17 @@
         _LIBUNWIND_LOG(msg, __VA_ARGS__);                                      \
     } while (0)
   #define _LIBUNWIND_TRACING_UNWINDING logUnwinding()
+  #define _LIBUNWIND_TRACING_DWARF logDWARF()
   #define _LIBUNWIND_TRACE_UNWINDING(msg, ...)                                 \
     do {                                                                       \
       if (logUnwinding())                                                      \
         _LIBUNWIND_LOG(msg, __VA_ARGS__);                                      \
     } while (0)
+  #define _LIBUNWIND_TRACE_DWARF(...)                                          \
+    do {                                                                       \
+      if (logDWARF())                                                          \
+        fprintf(stderr, __VA_ARGS__);                                          \
+    } while (0)
 #endif
 
 #ifdef __cplusplus