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

test/cctest/compiler/test-operator.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 <sstream>
 
 #include "src/v8.h"
 
 #include "src/compiler/operator.h"
 #include "test/cctest/cctest.h"
@@ skipping 62 matching lines @@
   std::ostringstream os;
   os << *op;
   return SmartArrayPointer<const char>(StrDup(os.str().c_str()));
 }
 
 
 TEST(TestOperator_Print) {
   Operator op1a(19, NONE, "Another1", 0, 0, 0, 0, 0, 0);
   Operator op1b(19, FOLD, "Another2", 2, 0, 0, 2, 0, 0);
 
-  CHECK_EQ(0, strcmp("Another1", OperatorToString(&op1a).get()));
-  CHECK_EQ(0, strcmp("Another2", OperatorToString(&op1b).get()));
+  CHECK_EQ("Another1", OperatorToString(&op1a).get());
+  CHECK_EQ("Another2", OperatorToString(&op1b).get());
 
   Operator op2a(20, NONE, "Flog1", 0, 0, 0, 0, 0, 0);
   Operator op2b(20, FOLD, "Flog2", 1, 0, 0, 1, 0, 0);
 
-  CHECK_EQ(0, strcmp("Flog1", OperatorToString(&op2a).get()));
-  CHECK_EQ(0, strcmp("Flog2", OperatorToString(&op2b).get()));
+  CHECK_EQ("Flog1", OperatorToString(&op2a).get());
+  CHECK_EQ("Flog2", OperatorToString(&op2b).get());
 }
 
 
 TEST(TestOperator1int_Hash) {
   Operator1<int> op1a(23, NONE, "Wolfie", 0, 0, 0, 0, 0, 0, 11);
   Operator1<int> op1b(23, FOLD, "Doggie", 2, 0, 0, 2, 0, 0, 11);
 
   CHECK(op1a.HashCode() == op1b.HashCode());
 
   Operator1<int> op2a(24, NONE, "Arfie", 0, 0, 0, 0, 0, 0, 3);
@@ skipping 40 matching lines @@
 
   CHECK(!op3.Equals(&op1a));
   CHECK(!op3.Equals(&op1b));
   CHECK(!op3.Equals(&op2a));
   CHECK(!op3.Equals(&op2b));
 }
 
 
 TEST(TestOperator1int_Print) {
   Operator1<int> op1(12, NONE, "Op1Test", 0, 0, 0, 1, 0, 0, 0);
-  CHECK_EQ(0, strcmp("Op1Test[0]", OperatorToString(&op1).get()));
+  CHECK_EQ("Op1Test[0]", OperatorToString(&op1).get());
 
   Operator1<int> op2(12, NONE, "Op1Test", 0, 0, 0, 1, 0, 0, 66666666);
-  CHECK_EQ(0, strcmp("Op1Test[66666666]", OperatorToString(&op2).get()));
+  CHECK_EQ("Op1Test[66666666]", OperatorToString(&op2).get());
 
   Operator1<int> op3(12, NONE, "FooBar", 0, 0, 0, 1, 0, 0, 2347);
-  CHECK_EQ(0, strcmp("FooBar[2347]", OperatorToString(&op3).get()));
+  CHECK_EQ("FooBar[2347]", OperatorToString(&op3).get());
 
   Operator1<int> op4(12, NONE, "BarFoo", 0, 0, 0, 1, 0, 0, -879);
-  CHECK_EQ(0, strcmp("BarFoo[-879]", OperatorToString(&op4).get()));
+  CHECK_EQ("BarFoo[-879]", OperatorToString(&op4).get());
 }
 
 
 TEST(TestOperator1double_Hash) {
   Operator1<double> op1a(23, NONE, "Wolfie", 0, 0, 0, 0, 0, 0, 11.77);
   Operator1<double> op1b(23, FOLD, "Doggie", 2, 0, 0, 2, 0, 0, 11.77);
 
   CHECK(op1a.HashCode() == op1b.HashCode());
 
   Operator1<double> op2a(24, NONE, "Arfie", 0, 0, 0, 0, 0, 0, -6.7);
   Operator1<double> op2b(24, NONE, "Arfie", 0, 0, 0, 0, 0, 0, -6.8);
 
   CHECK(op1a.HashCode() != op2a.HashCode());
   CHECK(op2a.HashCode() != op2b.HashCode());
 }
 
 
 TEST(TestOperator1doublePrint) {
   Operator1<double> op1a(23, NONE, "Canary", 0, 0, 0, 0, 0, 0, 0.5);
   Operator1<double> op1b(23, FOLD, "Finch", 2, 0, 0, 2, 0, 0, -1.5);
 
-  CHECK_EQ(0, strcmp("Canary[0.5]", OperatorToString(&op1a).get()));
-  CHECK_EQ(0, strcmp("Finch[-1.5]", OperatorToString(&op1b).get()));
+  CHECK_EQ("Canary[0.5]", OperatorToString(&op1a).get());
+  CHECK_EQ("Finch[-1.5]", OperatorToString(&op1b).get());
 }
 
 
 TEST(TestOperator1double_Equals) {
   Operator1<double> op1a(23, NONE, "Scratchy", 0, 0, 0, 0, 0, 0, 11.77);
   Operator1<double> op1b(23, FOLD, "Scratchy", 2, 0, 0, 2, 0, 0, 11.77);
 
   CHECK(op1a.Equals(&op1a));
   CHECK(op1a.Equals(&op1b));
   CHECK(op1b.Equals(&op1a));
@@ skipping 80 matching lines @@
 TEST(Operator_CountsOrder) {
   Operator op(29, NONE, "Flashy", 11, 22, 33, 44, 55, 66);
   CHECK_EQ(11, op.ValueInputCount());
   CHECK_EQ(22, op.EffectInputCount());
   CHECK_EQ(33, op.ControlInputCount());
 
   CHECK_EQ(44, op.ValueOutputCount());
   CHECK_EQ(55, op.EffectOutputCount());
   CHECK_EQ(66, op.ControlOutputCount());
 }