commit 199c27734f0e27aab5ed26ca20b2c93945c29732
author Elliott Hughes <enh@google.com> Wed Jun 21 15:09:53 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jun 21 15:09:55 2017 +0000
tree 43ff0261926590e78d9d53c0f5c5328b5e63b307
parent b6d3f282875416c3817aa163802f4b46b10bd981
parent 56731b4e2f9856a1d87a7672bfb621e68a5ad547

Merge "Shave a stack frame off asserts."

libmemunreachable/ScopedSignalHandler.h

diff --git a/libmemunreachable/ScopedSignalHandler.h b/libmemunreachable/ScopedSignalHandler.h
index ada2ae4..fab38ed 100644
--- a/libmemunreachable/ScopedSignalHandler.h
+++ b/libmemunreachable/ScopedSignalHandler.h
@@ -37,7 +37,7 @@
 
   template <class F>
   void install(int signal, F&& f) {
-    MEM_LOG_ALWAYS_FATAL_IF(signal_ != -1, "ScopedSignalHandler already installed");
+    if (signal != -1) MEM_LOG_ALWAYS_FATAL("ScopedSignalHandler already installed");
 
     handler_ = SignalFn(std::allocator_arg, allocator_,
                         [=](int signal, siginfo_t* si, void* uctx) { f(*this, signal, si, uctx); });

libmemunreachable/log.h

diff --git a/libmemunreachable/log.h b/libmemunreachable/log.h
index 1725c53..10b83db 100644
--- a/libmemunreachable/log.h
+++ b/libmemunreachable/log.h
@@ -30,9 +30,6 @@
 
 #define MEM_LOG_ALWAYS_FATAL(...) async_safe_fatal(__VA_ARGS__)
 
-#define MEM_LOG_ALWAYS_FATAL_IF(cond, ...) \
-  ((__predict_false(cond)) ? async_safe_fatal(__VA_ARGS__) : (void)0)
-
 #else
 
 #include <log/log.h>
@@ -43,7 +40,6 @@
 #define MEM_ALOGI ALOGI
 
 #define MEM_LOG_ALWAYS_FATAL LOG_ALWAYS_FATAL
-#define MEM_LOG_ALWAYS_FATAL_IF LOG_ALWAYS_FATAL_IF
 
 #endif