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

test/unittests/compiler/scheduler-unittest.cc

 // Copyright 2015 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/compiler/access-builder.h"
 #include "src/compiler/common-operator.h"
 #include "src/compiler/graph.h"
 #include "src/compiler/graph-visualizer.h"
 #include "src/compiler/js-operator.h"
 #include "src/compiler/node.h"
@@ skipping 58 matching lines @@
  public:
   SchedulerRPOTest() {}
 
   // TODO(titzer): pull RPO tests out to their own file.
   static void CheckRPONumbers(BasicBlockVector* order, size_t expected,
                               bool loops_allowed) {
     CHECK(expected == order->size());
     for (int i = 0; i < static_cast<int>(order->size()); i++) {
       CHECK(order->at(i)->rpo_number() == i);
       if (!loops_allowed) {
-        CHECK(!order->at(i)->loop_end());
-        CHECK(!order->at(i)->loop_header());
+        CHECK_EQ(NULL, order->at(i)->loop_end());
+        CHECK_EQ(NULL, order->at(i)->loop_header());
       }
     }
   }
 
   static void CheckLoop(BasicBlockVector* order, BasicBlock** blocks,
                         int body_size) {
     BasicBlock* header = blocks[0];
     BasicBlock* end = header->loop_end();
-    CHECK(end);
+    CHECK_NE(NULL, end);
     CHECK_GT(end->rpo_number(), 0);
     CHECK_EQ(body_size, end->rpo_number() - header->rpo_number());
     for (int i = 0; i < body_size; i++) {
       CHECK_GE(blocks[i]->rpo_number(), header->rpo_number());
       CHECK_LT(blocks[i]->rpo_number(), end->rpo_number());
       CHECK(header->LoopContains(blocks[i]));
       CHECK(header->IsLoopHeader() || blocks[i]->loop_header() == header);
     }
     if (header->rpo_number() > 0) {
       CHECK_NE(order->at(header->rpo_number() - 1)->loop_header(), header);
@@ skipping 1862 matching lines @@
 
   Schedule* schedule = ComputeAndVerifySchedule(13, graph());
   // Make sure the true block is marked as deferred.
   CHECK(schedule->block(t)->deferred());
   CHECK(!schedule->block(f)->deferred());
 }
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8