commit 4274889d48ef82369bf2c1ca70d84689b4f9e93a
author Brian Carlstrom <bdc@google.com> Thu Jul 18 18:04:08 2013 -0700
committer Brian Carlstrom <bdc@google.com> Thu Jul 18 18:10:42 2013 -0700
tree 9cc958f16e27ef3d6f50978c1024f79d7a56a725
parent 2d88862f0752a7a0e65145b088f49dabd49d4284

Fixing cpplint readability/check issues

Change-Id: Ia81db7238b4a13ff2e585aaac9d5e3e91df1e3e0

compiler/dex/mir_graph.cc

diff --git a/compiler/dex/mir_graph.cc b/compiler/dex/mir_graph.cc
index c2ee8e8..90e68ab 100644
--- a/compiler/dex/mir_graph.cc
+++ b/compiler/dex/mir_graph.cc
@@ -543,7 +543,7 @@
   if (current_method_ == 0) {
     DCHECK(entry_block_ == NULL);
     DCHECK(exit_block_ == NULL);
-    DCHECK(num_blocks_ == 0);
+    DCHECK_EQ(num_blocks_, 0);
     entry_block_ = NewMemBB(kEntryBlock, num_blocks_++);
     exit_block_ = NewMemBB(kExitBlock, num_blocks_++);
     block_list_.Insert(entry_block_);

compiler/dex/quick/arm/int_arm.cc

diff --git a/compiler/dex/quick/arm/int_arm.cc b/compiler/dex/quick/arm/int_arm.cc
index 3a367c9..15d361e 100644
--- a/compiler/dex/quick/arm/int_arm.cc
+++ b/compiler/dex/quick/arm/int_arm.cc
@@ -121,8 +121,8 @@
                                           int64_t val, ConditionCode ccode) {
   int32_t val_lo = Low32Bits(val);
   int32_t val_hi = High32Bits(val);
-  DCHECK(ModifiedImmediate(val_lo) >= 0);
-  DCHECK(ModifiedImmediate(val_hi) >= 0);
+  DCHECK_GE(ModifiedImmediate(val_lo), 0);
+  DCHECK_GE(ModifiedImmediate(val_hi), 0);
   LIR* taken = &block_label_list_[bb->taken->id];
   LIR* not_taken = &block_label_list_[bb->fall_through->id];
   rl_src1 = LoadValueWide(rl_src1, kCoreReg);

compiler/llvm/gbc_expander.cc

diff --git a/compiler/llvm/gbc_expander.cc b/compiler/llvm/gbc_expander.cc
index a7793ae..c990ee6 100644
--- a/compiler/llvm/gbc_expander.cc
+++ b/compiler/llvm/gbc_expander.cc
@@ -873,7 +873,7 @@
         break;
 
       case art::kVirtual:
-        DCHECK(vtable_idx != -1);
+        DCHECK_NE(vtable_idx, -1);
         callee_method_object_addr =
             EmitLoadVirtualCalleeMethodObjectAddr(vtable_idx, this_addr);
         break;
@@ -1073,7 +1073,7 @@
   uint32_t element_jty =
     llvm::cast<llvm::ConstantInt>(call_inst.getArgOperand(1))->getZExtValue();
 
-  DCHECK(call_inst.getNumArgOperands() > 2);
+  DCHECK_GT(call_inst.getNumArgOperands(), 2U);
   unsigned num_elements = (call_inst.getNumArgOperands() - 2);
 
   bool is_elem_int_ty = (static_cast<JType>(element_jty) == kInt);
@@ -3698,7 +3698,7 @@
                                 irb_.getJDoubleTy());
     }
     case IntrinsicHelper::ConstObj: {
-      CHECK(LV2UInt(call_inst.getArgOperand(0)) == 0);
+      CHECK_EQ(LV2UInt(call_inst.getArgOperand(0)), 0U);
       return irb_.getJNull();
     }