src: use struct as arguments to node::Assert

addaleax · addaleax · commit f02729054213 · 2019-02-03T20:56:43.000+01:00
This just makes the code a bit more obvious (subjectively). PR-URL: #25869 Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Refael Ackermann <refack@gmail.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
diff --git a/src/node_errors.cc b/src/node_errors.cc
@@ -166,23 +166,17 @@ void AppendExceptionLine(Environment* env,
   ABORT_NO_BACKTRACE();
 }
 
-[[noreturn]] void Assert(const char* const (*args)[4]) {
-  auto filename = (*args)[0];
-  auto linenum = (*args)[1];
-  auto message = (*args)[2];
-  auto function = (*args)[3];
-
+[[noreturn]] void Assert(const AssertionInfo& info) {
   char name[1024];
   GetHumanReadableProcessName(&name);
 
   fprintf(stderr,
-          "%s: %s:%s:%s%s Assertion `%s' failed.\n",
+          "%s: %s:%s%s Assertion `%s' failed.\n",
           name,
-          filename,
-          linenum,
-          function,
-          *function ? ":" : "",
-          message);
+          info.file_line,
+          info.function,
+          *info.function ? ":" : "",
+          info.message);
   fflush(stderr);
 
   Abort();
diff --git a/src/util.h b/src/util.h
@@ -85,10 +85,15 @@ extern bool v8_initialized;
 // whether V8 is initialized.
 void LowMemoryNotification();
 
-// The slightly odd function signature for Assert() is to ease
-// instruction cache pressure in calls from CHECK.
+// The reason that Assert() takes a struct argument instead of individual
+// const char*s is to ease instruction cache pressure in calls from CHECK.
+struct AssertionInfo {
+  const char* file_line;  // filename:line
+  const char* message;
+  const char* function;
+};
+[[noreturn]] void Assert(const AssertionInfo& info);
 [[noreturn]] void Abort();
-[[noreturn]] void Assert(const char* const (*args)[4]);
 void DumpBacktrace(FILE* fp);
 
 #define DISALLOW_COPY_AND_ASSIGN(TypeName)                                    \
@@ -120,9 +125,12 @@ void DumpBacktrace(FILE* fp);
 #define CHECK(expr)                                                           \
   do {                                                                        \
     if (UNLIKELY(!(expr))) {                                                  \
-      static const char* const args[] = { __FILE__, STRINGIFY(__LINE__),      \
-                                          #expr, PRETTY_FUNCTION_NAME };      \
-      node::Assert(&args);                                                    \
+      /* 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)
 
