Skip to content

src: remove unneeded ABORT after CHECK(0)

Checklist
  • make -j4 test (UNIX), or vcbuild test nosign (Windows) passes
  • tests and/or benchmarks are included
  • documentation is changed or added
  • commit message follows commit guidelines
Affected core subsystem(s)

src

Description of change

CHECK includes node::Abort(), so that's unneeded to call ABORT after CHECK(0).

In src/util.h:

#define ABORT() node::Abort()
#define CHECK(expr)                                                           \
  do {                                                                        \
    if (UNLIKELY(!(expr))) {                                                  \
      static const char* const args[] = { __FILE__, STRINGIFY(__LINE__),      \
                                          #expr, PRETTY_FUNCTION_NAME };      \
      node::Assert(&args);                                                    \
    }                                                                         \
  } while (0)

And in src/node.cc:

NO_RETURN void Abort() {
  // ...
}
NO_RETURN void Assert(const char* const (*args)[4]) {
  // ...
  Abort();
}

Thus we could remove ABORT()s after CHECK(0) :)

Merge request reports

Loading