src: move ABORT() logic into node::Abort()

bnoordhuis · Fishrock123 · commit b8919b1d2340 · 2016-07-05T22:36:49.000+02:00
Don't inline calls to node::DumpBacktrace() and fflush(), it makes the generated code bigger. A secondary benefit of moving it to a function is that it gives you something to put a breakpoint on. PR-URL: #6734 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
diff --git a/src/node.cc b/src/node.cc
@@ -1788,8 +1788,15 @@ void GetActiveHandles(const FunctionCallbackInfo<Value>& args) {
 }
 
 
+NO_RETURN void Abort() {
+  DumpBacktrace(stderr);
+  fflush(stderr);
+  ABORT_NO_BACKTRACE();
+}
+
+
 static void Abort(const FunctionCallbackInfo<Value>& args) {
-  ABORT();
+  Abort();
 }
 
 
diff --git a/src/node_internals.h b/src/node_internals.h
@@ -134,12 +134,10 @@ constexpr size_t arraysize(const T(&)[N]) { return N; }
 # define ROUND_UP(a, b) ((a) % (b) ? ((a) + (b)) - ((a) % (b)) : (a))
 #endif
 
-#if defined(__GNUC__) && __GNUC__ >= 4
+#ifdef __GNUC__
 # define MUST_USE_RESULT __attribute__((warn_unused_result))
-# define NO_RETURN __attribute__((noreturn))
 #else
 # define MUST_USE_RESULT
-# define NO_RETURN
 #endif
 
 bool IsExceptionDecorated(Environment* env, v8::Local<v8::Value> er);
diff --git a/src/util.h b/src/util.h
@@ -19,6 +19,13 @@
 
 namespace node {
 
+#ifdef __GNUC__
+#define NO_RETURN __attribute__((noreturn))
+#else
+#define NO_RETURN
+#endif
+
+NO_RETURN void Abort();
 void DumpBacktrace(FILE* fp);
 
 #ifdef __APPLE__
@@ -43,12 +50,7 @@ template <typename T> using remove_reference = std::remove_reference<T>;
 #define ABORT_NO_BACKTRACE() abort()
 #endif
 
-#define ABORT()                                                               \
-  do {                                                                        \
-    node::DumpBacktrace(stderr);                                              \
-    fflush(stderr);                                                           \
-    ABORT_NO_BACKTRACE();                                                     \
-  } while (0)
+#define ABORT() node::Abort()
 
 #if defined(NDEBUG)
 # define ASSERT(expression)

Original file line number	Diff line number	Diff line change
`@@ -1788,8 +1788,15 @@ void GetActiveHandles(const FunctionCallbackInfo<Value>& args) {`
`1788`	`1788`	`}`
`1789`	`1789`
`1790`	`1790`
	`1791`	`+NO_RETURN void Abort() {`
	`1792`	`+ DumpBacktrace(stderr);`
	`1793`	`+ fflush(stderr);`
	`1794`	`+ ABORT_NO_BACKTRACE();`
	`1795`	`+}`
	`1796`	`+`
	`1797`	`+`
`1791`	`1798`	`static void Abort(const FunctionCallbackInfo<Value>& args) {`
`1792`		`- ABORT();`
	`1799`	`+ Abort();`
`1793`	`1800`	`}`
`1794`	`1801`
`1795`	`1802`