diff options
| author | 2013-07-19 11:24:49 -0700 | |
|---|---|---|
| committer | 2013-07-19 11:24:49 -0700 | |
| commit | ebd66389dacec3118232fbd426c70dbed573cff1 (patch) | |
| tree | 7270c0974e643accf3899f1c76813e78780ec603 /compiler | |
| parent | ac43ae545ffca66aac813ed3e6ab54e3559b5e4e (diff) | |
| parent | 4274889d48ef82369bf2c1ca70d84689b4f9e93a (diff) | |
am 4274889d: Fixing cpplint readability/check issues
* commit '4274889d48ef82369bf2c1ca70d84689b4f9e93a':
Fixing cpplint readability/check issues
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/dex/mir_graph.cc | 2 | ||||
| -rw-r--r-- | compiler/dex/quick/arm/int_arm.cc | 4 | ||||
| -rw-r--r-- | compiler/llvm/gbc_expander.cc | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/compiler/dex/mir_graph.cc b/compiler/dex/mir_graph.cc index c2ee8e8812..90e68abad8 100644 --- a/compiler/dex/mir_graph.cc +++ b/compiler/dex/mir_graph.cc @@ -543,7 +543,7 @@ void MIRGraph::InlineMethod(const DexFile::CodeItem* code_item, uint32_t access_ 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_); diff --git a/compiler/dex/quick/arm/int_arm.cc b/compiler/dex/quick/arm/int_arm.cc index 3a367c984d..15d361edcc 100644 --- a/compiler/dex/quick/arm/int_arm.cc +++ b/compiler/dex/quick/arm/int_arm.cc @@ -121,8 +121,8 @@ void ArmMir2Lir::GenFusedLongCmpImmBranch(BasicBlock* bb, RegLocation rl_src1, 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); diff --git a/compiler/llvm/gbc_expander.cc b/compiler/llvm/gbc_expander.cc index a7793aec26..c990ee629a 100644 --- a/compiler/llvm/gbc_expander.cc +++ b/compiler/llvm/gbc_expander.cc @@ -873,7 +873,7 @@ llvm::Value* GBCExpanderPass::EmitInvoke(llvm::CallInst& call_inst) { 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 @@ void GBCExpanderPass::Expand_FilledNewArray(llvm::CallInst& call_inst) { 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 @@ GBCExpanderPass::ExpandIntrinsic(IntrinsicHelper::IntrinsicId intr_id, irb_.getJDoubleTy()); } case IntrinsicHelper::ConstObj: { - CHECK(LV2UInt(call_inst.getArgOperand(0)) == 0); + CHECK_EQ(LV2UInt(call_inst.getArgOperand(0)), 0U); return irb_.getJNull(); } |