Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 199c2773 authored by Elliott Hughes's avatar Elliott Hughes Committed by Gerrit Code Review
Browse files

Merge "Shave a stack frame off asserts."

parents b6d3f282 56731b4e

libmemunreachable/ScopedSignalHandler.h

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ class ScopedSignalHandler { 


  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

+0 −4
Original line number Diff line number Diff line
@@ -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