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

src/compiler/js-inlining.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/ast.h"
 #include "src/ast-numbering.h"
 #include "src/compiler/access-builder.h"
 #include "src/compiler/ast-graph-builder.h"
 #include "src/compiler/common-operator.h"
 #include "src/compiler/graph-inl.h"
@@ skipping 66 matching lines @@
     Node* unique_return = NodeProperties::GetControlInput(end_);
     DCHECK_EQ(IrOpcode::kReturn, unique_return->opcode());
     return unique_return;
   }
 
   // Counts JSFunction, Receiver, arguments, context but not effect, control.
   size_t total_parameters() { return start_->op()->ValueOutputCount(); }
 
   // Counts only formal parameters.
   size_t formal_parameters() {
-    DCHECK_GE(total_parameters(), 3u);
+    DCHECK_GE(total_parameters(), 3);
     return total_parameters() - 3;
   }
 
   // Inline this graph at {call}, use {jsgraph} and its zone to create
   // any new nodes.
   void InlineAtCall(JSGraph* jsgraph, Node* call);
 
   // Ensure that only a single return reaches the end node.
   static void UnifyReturn(JSGraph* jsgraph);
 
@@ skipping 71 matching lines @@
         target_graph_->NewNode(original->op(), static_cast<int>(inputs.size()),
                                (inputs.empty() ? NULL : &inputs.front()));
     copies_[original->id()] = copy;
   }
 
   Node* GetCopy(Node* original) {
     Node* copy = copies_[original->id()];
     if (copy == NULL) {
       copy = GetSentinel(original);
     }
-    DCHECK(copy);
+    DCHECK_NE(NULL, copy);
     return copy;
   }
 
   void CopyGraph() {
     source_graph_->VisitNodeInputsFromEnd(this);
     ReplaceSentinels();
   }
 
   const NodeVector& copies() { return copies_; }
 
  private:
   void ReplaceSentinels() {
     for (NodeId id = 0; id < source_graph_->NodeCount(); ++id) {
       Node* sentinel = sentinels_[id];
       if (sentinel == NULL) continue;
       Node* copy = copies_[id];
-      DCHECK(copy);
+      DCHECK_NE(NULL, copy);
       sentinel->ReplaceUses(copy);
     }
   }
 
   Node* GetSentinel(Node* original) {
     if (sentinels_[original->id()] == NULL) {
       sentinels_[original->id()] = target_graph_->NewNode(&sentinel_op_);
     }
     return sentinels_[original->id()];
   }
@@ skipping 201 matching lines @@
       }
     }
   }
 
   inlinee.InlineAtCall(jsgraph_, call_node);
 }
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8