Revert "Make GCC happy again." and "Initial switch to Chromium-style CHECK_* and DCHECK_* macros.".

src/hydrogen-check-elimination.cc

 // Copyright 2013 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/hydrogen-check-elimination.h"
 
 #include "src/hydrogen-alias-analysis.h"
 #include "src/hydrogen-flow-engine.h"
 
 #define GLOBAL 1
@@ skipping 355 matching lines @@
       HGraph* graph = instr->block()->graph();
       if (entry->maps_->IsSubset(instr->maps())) {
         // The first check is more strict; the second is redundant.
         if (entry->check_ != NULL) {
           DCHECK_NE(HCheckTableEntry::UNCHECKED_STABLE, entry->state_);
           TRACE(("Replacing redundant CheckMaps #%d at B%d with #%d\n",
               instr->id(), instr->block()->block_id(), entry->check_->id()));
           instr->DeleteAndReplaceWith(entry->check_);
           INC_STAT(redundant_);
         } else if (entry->state_ == HCheckTableEntry::UNCHECKED_STABLE) {
-          DCHECK_NULL(entry->check_);
+          DCHECK_EQ(NULL, entry->check_);
           TRACE(("Marking redundant CheckMaps #%d at B%d as stability check\n",
                  instr->id(), instr->block()->block_id()));
           instr->set_maps(entry->maps_->Copy(graph->zone()));
           instr->MarkAsStabilityCheck();
           entry->state_ = HCheckTableEntry::CHECKED_STABLE;
         } else if (!instr->IsStabilityCheck()) {
           TRACE(("Marking redundant CheckMaps #%d at B%d as dead\n",
               instr->id(), instr->block()->block_id()));
           // Mark check as dead but leave it in the graph as a checkpoint for
           // subsequent checks.
@@ skipping 290 matching lines @@
       }
     }
     if (compact) Compact();
   }
 
   // Kill everything in the table that may alias {object}.
   void Kill(HValue* object) {
     bool compact = false;
     for (int i = 0; i < size_; i++) {
       HCheckTableEntry* entry = &entries_[i];
-      DCHECK_NOT_NULL(entry->object_);
+      DCHECK(entry->object_ != NULL);
       if (phase_->aliasing_->MayAlias(entry->object_, object)) {
         entry->object_ = NULL;
         compact = true;
       }
     }
     if (compact) Compact();
-    DCHECK_NULL(Find(object));
+    DCHECK(Find(object) == NULL);
   }
 
   void Compact() {
     // First, compact the array in place.
     int max = size_, dest = 0, old_cursor = cursor_;
     for (int i = 0; i < max; i++) {
       if (entries_[i].object_ != NULL) {
         if (dest != i) entries_[dest] = entries_[i];
         dest++;
       } else {
@@ skipping 189 matching lines @@
   PRINT_STAT(removed_cit);
   PRINT_STAT(narrowed);
   PRINT_STAT(loads);
   PRINT_STAT(empty);
   PRINT_STAT(compares_true);
   PRINT_STAT(compares_false);
   PRINT_STAT(transitions);
 }
 
 } }  // namespace v8::internal