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

test/cctest/compiler/test-loop-assignment-analysis.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/compiler/ast-loop-assignment-analyzer.h"
 #include "src/parser.h"
 #include "src/rewriter.h"
 #include "src/scopes.h"
 #include "test/cctest/cctest.h"
 
@@ skipping 19 matching lines @@
   void CheckLoopAssignedCount(int expected, const char* var_name) {
     // TODO(titzer): don't scope analyze every single time.
     CompilationInfo info(function, main_zone());
 
     CHECK(Parser::Parse(&info));
     CHECK(Rewriter::Rewrite(&info));
     CHECK(Scope::Analyze(&info));
 
     Scope* scope = info.function()->scope();
     AstValueFactory* factory = info.ast_value_factory();
-    CHECK(scope);
+    CHECK_NE(NULL, scope);
 
     if (result == NULL) {
       AstLoopAssignmentAnalyzer analyzer(main_zone(), &info);
       result = analyzer.Analyze();
-      CHECK(result);
+      CHECK_NE(NULL, result);
     }
 
     const i::AstRawString* name = factory->GetOneByteString(var_name);
 
     i::Variable* var = scope->Lookup(name);
-    CHECK(var);
+    CHECK_NE(NULL, var);
 
     if (var->location() == Variable::UNALLOCATED) {
       CHECK_EQ(0, expected);
     } else {
       CHECK(var->IsStackAllocated());
       CHECK_EQ(expected, result->GetAssignmentCountForTesting(scope, var));
     }
   }
 };
 }
@@ skipping 223 matching lines @@
       "    while (1) z++;"
       "  }"
       "}"
       "w;");
 
   f.CheckLoopAssignedCount(1, "x");
   f.CheckLoopAssignedCount(3, "y");
   f.CheckLoopAssignedCount(5, "z");
   f.CheckLoopAssignedCount(0, "w");
 }