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

test/cctest/compiler/test-instruction.cc

 // Copyright 2014 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/v8.h"
 #include "test/cctest/cctest.h"
 
 #include "src/compiler/code-generator.h"
 #include "src/compiler/common-operator.h"
 #include "src/compiler/graph.h"
@@ skipping 117 matching lines @@
   }
 
   R.allocCode();
 
   BasicBlockVector* blocks = R.schedule.rpo_order();
   CHECK_EQ(static_cast<int>(blocks->size()), R.code->InstructionBlockCount());
 
   for (auto block : *blocks) {
     CHECK_EQ(block->rpo_number(), R.BlockAt(block)->rpo_number().ToInt());
     CHECK_EQ(block->id().ToInt(), R.BlockAt(block)->id().ToInt());
-    CHECK(!block->loop_end());
+    CHECK_EQ(NULL, block->loop_end());
   }
 }
 
 
 TEST(InstructionGetBasicBlock) {
   InstructionTester R;
 
   BasicBlock* b0 = R.schedule.start();
   BasicBlock* b1 = R.schedule.NewBasicBlock();
   BasicBlock* b2 = R.schedule.NewBasicBlock();
@@ skipping 122 matching lines @@
   int indexes[] = {0, 2, -1};
   for (int i = 0; indexes[i] >= 0; i++) {
     int index = indexes[i];
 
     UnallocatedOperand* op1 = R.NewUnallocated(index + 6);
     UnallocatedOperand* op2 = R.NewUnallocated(index + 12);
 
     R.code->AddGapMove(index, op1, op2);
     GapInstruction* gap = R.code->GapAt(index);
     ParallelMove* move = gap->GetParallelMove(GapInstruction::START);
-    CHECK(move);
+    CHECK_NE(NULL, move);
     const ZoneList<MoveOperands>* move_operands = move->move_operands();
     CHECK_EQ(1, move_operands->length());
     MoveOperands* cur = &move_operands->at(0);
     CHECK_EQ(op1, cur->source());
     CHECK_EQ(op2, cur->destination());
   }
 }
 
 
 TEST(InstructionOperands) {
@@ skipping 41 matching lines @@
           CHECK(inputs[z]->Equals(m->InputAt(z)));
         }
 
         for (size_t z = 0; z < k; z++) {
           CHECK(temps[z]->Equals(m->TempAt(z)));
         }
       }
     }
   }
 }