src: update UNREACHABLE macro to take a string

nitsakh · targos · commit d21e066f5ac7 · 2019-05-20T13:20:19.000+02:00
PR-URL: #26502 Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com> Reviewed-By: Refael Ackermann <refack@gmail.com>
diff --git a/src/node_crypto.cc b/src/node_crypto.cc
@@ -3456,7 +3456,7 @@ static ManagedEVPPKey GetPublicOrPrivateKeyFromJs(
           is_public = false;
           break;
         default:
-          CHECK(!"Invalid key encoding type");
+          UNREACHABLE("Invalid key encoding type");
       }
 
       if (is_public) {
diff --git a/src/node_file.h b/src/node_file.h
@@ -162,7 +162,7 @@ template <typename NativeT,
 constexpr NativeT ToNative(uv_timespec_t ts) {
   // This template has exactly two specializations below.
   static_assert(std::is_arithmetic<NativeT>::value == false, "Not implemented");
-  UNREACHABLE();
+  return NativeT();
 }
 
 template <>
diff --git a/src/util.h b/src/util.h
@@ -116,6 +116,16 @@ void DumpBacktrace(FILE* fp);
 
 #define ABORT() node::Abort()
 
+#define ERROR_AND_ABORT(expr)                                                 \
+  do {                                                                        \
+    /* Make sure that this struct does not end up in inline code, but      */ \
+    /* rather in a read-only data section when modifying this code.        */ \
+    static const node::AssertionInfo args = {                                 \
+      __FILE__ ":" STRINGIFY(__LINE__), #expr, PRETTY_FUNCTION_NAME           \
+    };                                                                        \
+    node::Assert(args);                                                       \
+  } while (0)
+
 #ifdef __GNUC__
 #define LIKELY(expr) __builtin_expect(!!(expr), 1)
 #define UNLIKELY(expr) __builtin_expect(!!(expr), 0)
@@ -132,12 +142,7 @@ void DumpBacktrace(FILE* fp);
 #define CHECK(expr)                                                           \
   do {                                                                        \
     if (UNLIKELY(!(expr))) {                                                  \
-      /* Make sure that this struct does not end up in inline code, but    */ \
-      /* rather in a read-only data section when modifying this code.      */ \
-      static const node::AssertionInfo args = {                               \
-        __FILE__ ":" STRINGIFY(__LINE__), #expr, PRETTY_FUNCTION_NAME         \
-      };                                                                      \
-      node::Assert(args);                                                     \
+      ERROR_AND_ABORT(expr);                                                  \
     }                                                                         \
   } while (0)
 
@@ -176,7 +181,8 @@ void DumpBacktrace(FILE* fp);
 #endif
 
 
-#define UNREACHABLE() ABORT()
+#define UNREACHABLE(expr)                                                     \
+  ERROR_AND_ABORT("Unreachable code reached: " expr)
 
 // TAILQ-style intrusive list node.
 template <typename T>

Original file line number	Diff line number	Diff line change
`@@ -3456,7 +3456,7 @@ static ManagedEVPPKey GetPublicOrPrivateKeyFromJs(`
`3456`	`3456`	`is_public = false;`
`3457`	`3457`	`break;`
`3458`	`3458`	`default:`
`3459`		`- CHECK(!"Invalid key encoding type");`
	`3459`	`+ UNREACHABLE("Invalid key encoding type");`
`3460`	`3460`	`}`
`3461`	`3461`
`3462`	`3462`	`if (is_public) {`
Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ template <typename NativeT,`
`162`	`162`	`constexpr NativeT ToNative(uv_timespec_t ts) {`
`163`	`163`	`// This template has exactly two specializations below.`
`164`	`164`	`static_assert(std::is_arithmetic<NativeT>::value == false, "Not implemented");`
`165`		`- UNREACHABLE();`
	`165`	`+ return NativeT();`
`166`	`166`	`}`
`167`	`167`
`168`	`168`	`template <>`