Index: src/serialize.cc |
diff --git a/src/serialize.cc b/src/serialize.cc |
index 0c9df8e51be5b97523b3480074ba060e232f1dd8..f4849f32e4a9690a5590d4be58ec73a65d50ac4e 100644 |
--- a/src/serialize.cc |
+++ b/src/serialize.cc |
@@ -95,12 +95,12 @@ void ExternalReferenceTable::Add(Address address, |
TypeCode type, |
uint16_t id, |
const char* name) { |
- DCHECK_NE(NULL, address); |
+ DCHECK_NOT_NULL(address); |
ExternalReferenceEntry entry; |
entry.address = address; |
entry.code = EncodeExternal(type, id); |
entry.name = name; |
- DCHECK_NE(0, entry.code); |
+ DCHECK_NE(0u, entry.code); |
// Assert that the code is added in ascending order to rule out duplicates. |
DCHECK((size() == 0) || (code(size() - 1) < entry.code)); |
refs_.Add(entry); |
@@ -647,10 +647,10 @@ bool Deserializer::ReserveSpace() { |
void Deserializer::Initialize(Isolate* isolate) { |
- DCHECK_EQ(NULL, isolate_); |
- DCHECK_NE(NULL, isolate); |
+ DCHECK_NULL(isolate_); |
+ DCHECK_NOT_NULL(isolate); |
isolate_ = isolate; |
- DCHECK_EQ(NULL, external_reference_decoder_); |
+ DCHECK_NULL(external_reference_decoder_); |
external_reference_decoder_ = new ExternalReferenceDecoder(isolate); |
} |
@@ -659,7 +659,7 @@ void Deserializer::Deserialize(Isolate* isolate) { |
Initialize(isolate); |
if (!ReserveSpace()) FatalProcessOutOfMemory("deserializing context"); |
// No active threads. |
- DCHECK_EQ(NULL, isolate_->thread_manager()->FirstThreadStateInUse()); |
+ DCHECK_NULL(isolate_->thread_manager()->FirstThreadStateInUse()); |
// No active handles. |
DCHECK(isolate_->handle_scope_implementer()->blocks()->is_empty()); |
isolate_->heap()->IterateSmiRoots(this); |
@@ -925,7 +925,7 @@ Address Deserializer::Allocate(int space_index, int size) { |
} else { |
DCHECK(space_index < kNumberOfPreallocatedSpaces); |
Address address = high_water_[space_index]; |
- DCHECK_NE(NULL, address); |
+ DCHECK_NOT_NULL(address); |
high_water_[space_index] += size; |
#ifdef DEBUG |
// Assert that the current reserved chunk is still big enough. |
@@ -1366,7 +1366,7 @@ Serializer::~Serializer() { |
void StartupSerializer::SerializeStrongReferences() { |
Isolate* isolate = this->isolate(); |
// No active threads. |
- CHECK_EQ(NULL, isolate->thread_manager()->FirstThreadStateInUse()); |
+ CHECK_NULL(isolate->thread_manager()->FirstThreadStateInUse()); |
// No active or weak handles. |
CHECK(isolate->handle_scope_implementer()->blocks()->is_empty()); |
CHECK_EQ(0, isolate->global_handles()->NumberOfWeakHandles()); |