Reland "Initial switch to Chromium-style CHECK_* and DCHECK_* macros.".

test/cctest/compiler/test-control-reducer.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/base/bits.h"
 #include "src/compiler/common-operator.h"
 #include "src/compiler/control-reducer.h"
@@ skipping 203 matching lines @@
   CHECK(IsUsedBy(T.start, T.p0));
   CheckInputs(T.p0, T.start);
 }
 
 
 TEST(Trim1_dead) {
   ControlReducerTester T;
   CHECK(IsUsedBy(T.start, T.p0));
   T.Trim();
   CHECK(!IsUsedBy(T.start, T.p0));
-  CHECK_EQ(NULL, T.p0->InputAt(0));
+  CHECK(!T.p0->InputAt(0));
 }
 
 
 TEST(Trim2_live) {
   ControlReducerTester T;
   Node* phi =
       T.graph.NewNode(T.common.Phi(kMachAnyTagged, 2), T.one, T.half, T.start);
   CHECK(IsUsedBy(T.one, phi));
   CHECK(IsUsedBy(T.half, phi));
   CHECK(IsUsedBy(T.start, phi));
@@ skipping 10 matching lines @@
   ControlReducerTester T;
   Node* phi =
       T.graph.NewNode(T.common.Phi(kMachAnyTagged, 2), T.one, T.half, T.start);
   CHECK(IsUsedBy(T.one, phi));
   CHECK(IsUsedBy(T.half, phi));
   CHECK(IsUsedBy(T.start, phi));
   T.Trim();
   CHECK(!IsUsedBy(T.one, phi));
   CHECK(!IsUsedBy(T.half, phi));
   CHECK(!IsUsedBy(T.start, phi));
-  CHECK_EQ(NULL, phi->InputAt(0));
-  CHECK_EQ(NULL, phi->InputAt(1));
-  CHECK_EQ(NULL, phi->InputAt(2));
+  CHECK(!phi->InputAt(0));
+  CHECK(!phi->InputAt(1));
+  CHECK(!phi->InputAt(2));
 }
 
 
 TEST(Trim_chain1) {
   ControlReducerTester T;
   const int kDepth = 15;
   Node* live[kDepth];
   Node* dead[kDepth];
   Node* end = T.start;
   for (int i = 0; i < kDepth; i++) {
     live[i] = end = T.graph.NewNode(T.common.Merge(1), end);
     dead[i] = T.graph.NewNode(T.common.Merge(1), end);
   }
   // end         -> live[last] ->  live[last-1] -> ... -> start
   //     dead[last] ^ dead[last-1] ^ ...                  ^
   T.graph.SetEnd(end);
   T.Trim();
   for (int i = 0; i < kDepth; i++) {
     CHECK(!IsUsedBy(live[i], dead[i]));
-    CHECK_EQ(NULL, dead[i]->InputAt(0));
+    CHECK(!dead[i]->InputAt(0));
     CHECK_EQ(i == 0 ? T.start : live[i - 1], live[i]->InputAt(0));
   }
 }
 
 
 TEST(Trim_chain2) {
   ControlReducerTester T;
   const int kDepth = 15;
   Node* live[kDepth];
   Node* dead[kDepth];
@@ skipping 59 matching lines @@
   CHECK(IsUsedBy(T.start, loop));
   CHECK(IsUsedBy(loop, end));
   CHECK(IsUsedBy(loop, loop));
   CheckInputs(loop, T.start, loop);
   CheckInputs(end, loop);
 
   // phi should have been trimmed away.
   CHECK(!IsUsedBy(loop, phi));
   CHECK(!IsUsedBy(T.one, phi));
   CHECK(!IsUsedBy(T.half, phi));
-  CHECK_EQ(NULL, phi->InputAt(0));
-  CHECK_EQ(NULL, phi->InputAt(1));
-  CHECK_EQ(NULL, phi->InputAt(2));
+  CHECK(!phi->InputAt(0));
+  CHECK(!phi->InputAt(1));
+  CHECK(!phi->InputAt(2));
 }
 
 
 void CheckTrimConstant(ControlReducerTester* T, Node* k) {
   Node* phi = T->graph.NewNode(T->common.Phi(kMachInt32, 1), k, T->start);
   CHECK(IsUsedBy(k, phi));
   T->Trim();
   CHECK(!IsUsedBy(k, phi));
-  CHECK_EQ(NULL, phi->InputAt(0));
-  CHECK_EQ(NULL, phi->InputAt(1));
+  CHECK(!phi->InputAt(0));
+  CHECK(!phi->InputAt(1));
 }
 
 
 TEST(Trim_constants) {
   ControlReducerTester T;
   int32_t int32_constants[] = {
       0, -1,  -2,  2,  2,  3,  3,  4,  4,  5,  5,  4,  5,  6, 6, 7, 8, 7, 8, 9,
       0, -11, -12, 12, 12, 13, 13, 14, 14, 15, 15, 14, 15, 6, 6, 7, 8, 7, 8, 9};
 
   for (size_t i = 0; i < arraysize(int32_constants); i++) {
@@ skipping 567 matching lines @@
   ControlReducerTester R;
   for (int i = 0; i < 5; i++) {
     Node* merge = R.graph.NewNode(R.common.Merge(1), R.dead);
     for (int j = 0; j < i; j++) {
       merge = R.graph.NewNode(R.common.Merge(1), merge);
     }
     Node* end = R.graph.NewNode(R.common.End(), merge);
     R.graph.SetEnd(end);
     R.ReduceGraph();
     CHECK(merge->IsDead());
-    CHECK_EQ(NULL, end->InputAt(0));  // end dies.
+    CHECK(!end->InputAt(0));  // end dies.
   }
 }
 
 
 TEST(CMergeReduce_dead_chain2) {
   ControlReducerTester R;
   for (int i = 0; i < 5; i++) {
     Node* merge = R.graph.NewNode(R.common.Merge(1), R.start);
     for (int j = 0; j < i; j++) {
       merge = R.graph.NewNode(R.common.Merge(2), merge, R.dead);
@@ skipping 538 matching lines @@
 
   Node* ret = R.Return(d1.phi, R.start, d1.merge);
 
   R.ReduceGraph();  // d1 gets folded true.
 
   CheckInputs(ret, y2, R.start, R.start);
   CheckDeadDiamond(d1);
   CheckDeadDiamond(d2);
   CheckDeadDiamond(d3);
 }