Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
src: use DCHECK_* macros where possible
PR-URL: #25207
Reviewed-By: Michaël Zasso <[email protected]>
Reviewed-By: Anna Henningsen <[email protected]>
Reviewed-By: Ruben Bridgewater <[email protected]>
Reviewed-By: Tobias Nießen <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>
  • Loading branch information
cjihrig committed Dec 26, 2018
commit c2b4269b77822aee6d07ae427a3341abdbaa8c3f
12 changes: 4 additions & 8 deletions src/aliased_buffer.h
Original file line number Diff line number Diff line change
Expand Up @@ -198,19 +198,15 @@ class AliasedBuffer {
* Set position index to given value.
*/
inline void SetValue(const size_t index, NativeT value) {
#if defined(DEBUG) && DEBUG
CHECK_LT(index, count_);
#endif
DCHECK_LT(index, count_);
buffer_[index] = value;
}

/**
* Get value at position index
*/
inline const NativeT GetValue(const size_t index) const {
#if defined(DEBUG) && DEBUG
CHECK_LT(index, count_);
#endif
DCHECK_LT(index, count_);
return buffer_[index];
}

Expand All @@ -233,9 +229,9 @@ class AliasedBuffer {
// Should only be used on an owning array, not one created as a sub array of
// an owning `AliasedBuffer`.
void reserve(size_t new_capacity) {
DCHECK_GE(new_capacity, count_);
DCHECK_EQ(byte_offset_, 0);
#if defined(DEBUG) && DEBUG
CHECK_GE(new_capacity, count_);
CHECK_EQ(byte_offset_, 0);
CHECK(free_buffer_);
#endif
const v8::HandleScope handle_scope(isolate_);
Expand Down
2 changes: 1 addition & 1 deletion src/base_object-inl.h
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,8 @@ BaseObject::MakeLazilyInitializedJSTemplate(Environment* env) {
auto constructor = [](const v8::FunctionCallbackInfo<v8::Value>& args) {
#ifdef DEBUG
CHECK(args.IsConstructCall());
CHECK_GT(args.This()->InternalFieldCount(), 0);
#endif
DCHECK_GT(args.This()->InternalFieldCount(), 0);
args.This()->SetAlignedPointerInInternalField(0, nullptr);
};

Expand Down
4 changes: 1 addition & 3 deletions src/debug_utils.h
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,7 @@ template <typename... Args>
inline void FORCE_INLINE Debug(AsyncWrap* async_wrap,
const char* format,
Args&&... args) {
#ifdef DEBUG
CHECK_NOT_NULL(async_wrap);
#endif
DCHECK_NOT_NULL(async_wrap);
DebugCategory cat =
static_cast<DebugCategory>(async_wrap->provider_type());
if (!UNLIKELY(async_wrap->env()->debug_enabled(cat)))
Expand Down
10 changes: 3 additions & 7 deletions src/string_decoder.cc
Original file line number Diff line number Diff line change
Expand Up @@ -123,11 +123,9 @@ MaybeLocal<String> StringDecoder::DecodeData(Isolate* isolate,
body = !prepend.IsEmpty() ? prepend : String::Empty(isolate);
prepend = Local<String>();
} else {
#ifdef DEBUG
// If not, that means is no character left to finish at this point.
CHECK_EQ(MissingBytes(), 0);
CHECK_EQ(BufferedBytes(), 0);
#endif
DCHECK_EQ(MissingBytes(), 0);
DCHECK_EQ(BufferedBytes(), 0);

// See whether there is a character that we may have to cut off and
// finish when receiving the next chunk.
Expand All @@ -136,9 +134,7 @@ MaybeLocal<String> StringDecoder::DecodeData(Isolate* isolate,
// This means we'll need to figure out where the character to which
// the byte belongs begins.
for (size_t i = nread - 1; ; --i) {
#ifdef DEBUG
CHECK_LT(i, nread);
#endif
DCHECK_LT(i, nread);
state_[kBufferedBytes]++;
if ((data[i] & 0xC0) == 0x80) {
// This byte does not start a character (a "trailing" byte).
Expand Down
4 changes: 1 addition & 3 deletions src/string_search.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,7 @@ class Vector {

// Access individual vector elements - checks bounds in debug mode.
T& operator[](size_t index) const {
#ifdef DEBUG
CHECK(index < length_);
#endif
DCHECK_LT(index, length_);
return start_[is_forward_ ? index : (length_ - index - 1)];
}

Expand Down