From 4e31a7f3546bb848058a55b3aa629b5f12d1caf9 Mon Sep 17 00:00:00 2001
From: cjihrig <cjihrig@gmail.com>
Date: Mon, 24 Dec 2018 12:24:08 -0500
Subject: [PATCH] src: introduce DCHECK macro
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit adds a DCHECK macro for consistency with the
other DCHECK_* macros.

PR-URL: https://github.com/nodejs/node/pull/25207
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
---
 src/aliased_buffer.h        | 4 +---
 src/base_object-inl.h       | 4 +---
 src/inspector/node_string.h | 4 ----
 src/string_decoder.cc       | 4 +---
 src/util.h                  | 2 ++
 5 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/aliased_buffer.h b/src/aliased_buffer.h
index 0bae974af7a52c..eae60f4d93a9c0 100644
--- a/src/aliased_buffer.h
+++ b/src/aliased_buffer.h
@@ -231,9 +231,7 @@ class AliasedBuffer {
   void reserve(size_t new_capacity) {
     DCHECK_GE(new_capacity, count_);
     DCHECK_EQ(byte_offset_, 0);
-#if defined(DEBUG) && DEBUG
-    CHECK(free_buffer_);
-#endif
+    DCHECK(free_buffer_);
     const v8::HandleScope handle_scope(isolate_);
 
     const size_t old_size_in_bytes = sizeof(NativeT) * count_;
diff --git a/src/base_object-inl.h b/src/base_object-inl.h
index 84c449a30814e2..f1f1498e6c6128 100644
--- a/src/base_object-inl.h
+++ b/src/base_object-inl.h
@@ -113,9 +113,7 @@ void BaseObject::ClearWeak() {
 v8::Local<v8::FunctionTemplate>
 BaseObject::MakeLazilyInitializedJSTemplate(Environment* env) {
   auto constructor = [](const v8::FunctionCallbackInfo<v8::Value>& args) {
-#ifdef DEBUG
-    CHECK(args.IsConstructCall());
-#endif
+    DCHECK(args.IsConstructCall());
     DCHECK_GT(args.This()->InternalFieldCount(), 0);
     args.This()->SetAlignedPointerInInternalField(0, nullptr);
   };
diff --git a/src/inspector/node_string.h b/src/inspector/node_string.h
index 4588364ab12196..504798853675a5 100644
--- a/src/inspector/node_string.h
+++ b/src/inspector/node_string.h
@@ -73,8 +73,4 @@ extern size_t kNotFound;
 }  // namespace inspector
 }  // namespace node
 
-#ifndef DCHECK
-  #define DCHECK CHECK
-  #define DCHECK_LT CHECK_LT
-#endif  // DCHECK
 #endif  // SRC_INSPECTOR_NODE_STRING_H_
diff --git a/src/string_decoder.cc b/src/string_decoder.cc
index 96c6baa4d815e4..ceee1c9d762060 100644
--- a/src/string_decoder.cc
+++ b/src/string_decoder.cc
@@ -44,9 +44,7 @@ MaybeLocal<String> MakeString(Isolate* isolate,
     isolate->ThrowException(error);
   }
 
-#ifdef DEBUG
-  CHECK(ret.IsEmpty() || ret.ToLocalChecked()->IsString());
-#endif
+  DCHECK(ret.IsEmpty() || ret.ToLocalChecked()->IsString());
   return ret.FromMaybe(Local<Value>()).As<String>();
 }
 
diff --git a/src/util.h b/src/util.h
index 36a2ec9e3a6270..d3835c7e692b7d 100644
--- a/src/util.h
+++ b/src/util.h
@@ -130,6 +130,7 @@ void DumpBacktrace(FILE* fp);
 #define CHECK_IMPLIES(a, b) CHECK(!(a) || (b))
 
 #ifdef DEBUG
+  #define DCHECK(expr) CHECK(expr)
   #define DCHECK_EQ(a, b) CHECK((a) == (b))
   #define DCHECK_GE(a, b) CHECK((a) >= (b))
   #define DCHECK_GT(a, b) CHECK((a) > (b))
@@ -140,6 +141,7 @@ void DumpBacktrace(FILE* fp);
   #define DCHECK_NOT_NULL(val) CHECK((val) != nullptr)
   #define DCHECK_IMPLIES(a, b) CHECK(!(a) || (b))
 #else
+  #define DCHECK(expr)
   #define DCHECK_EQ(a, b)
   #define DCHECK_GE(a, b)
   #define DCHECK_GT(a, b)