Index: src/x64/macro-assembler-x64.cc |
diff --git a/src/x64/macro-assembler-x64.cc b/src/x64/macro-assembler-x64.cc |
index 3a477fc7937382ceae2ba1951f918683cb779c0e..2071038b0fb40b97d5a1cf2dc0e2c19ff0fe8ced 100644 |
--- a/src/x64/macro-assembler-x64.cc |
+++ b/src/x64/macro-assembler-x64.cc |
@@ -1640,7 +1640,7 @@ void MacroAssembler::SmiAdd(Register dst, |
Register src2, |
Label* on_not_smi_result, |
Label::Distance near_jump) { |
- DCHECK_NOT_NULL(on_not_smi_result); |
+ DCHECK(on_not_smi_result); |
DCHECK(!dst.is(src2)); |
SmiAddHelper<Register>(this, dst, src1, src2, on_not_smi_result, near_jump); |
} |
@@ -1651,7 +1651,7 @@ void MacroAssembler::SmiAdd(Register dst, |
const Operand& src2, |
Label* on_not_smi_result, |
Label::Distance near_jump) { |
- DCHECK_NOT_NULL(on_not_smi_result); |
+ DCHECK(on_not_smi_result); |
DCHECK(!src2.AddressUsesRegister(dst)); |
SmiAddHelper<Operand>(this, dst, src1, src2, on_not_smi_result, near_jump); |
} |
@@ -1704,7 +1704,7 @@ void MacroAssembler::SmiSub(Register dst, |
Register src2, |
Label* on_not_smi_result, |
Label::Distance near_jump) { |
- DCHECK_NOT_NULL(on_not_smi_result); |
+ DCHECK(on_not_smi_result); |
DCHECK(!dst.is(src2)); |
SmiSubHelper<Register>(this, dst, src1, src2, on_not_smi_result, near_jump); |
} |
@@ -1715,7 +1715,7 @@ void MacroAssembler::SmiSub(Register dst, |
const Operand& src2, |
Label* on_not_smi_result, |
Label::Distance near_jump) { |
- DCHECK_NOT_NULL(on_not_smi_result); |
+ DCHECK(on_not_smi_result); |
DCHECK(!src2.AddressUsesRegister(dst)); |
SmiSubHelper<Operand>(this, dst, src1, src2, on_not_smi_result, near_jump); |
} |
@@ -2198,7 +2198,7 @@ void MacroAssembler::SelectNonSmi(Register dst, |
Check(not_both_smis, kBothRegistersWereSmisInSelectNonSmi); |
#endif |
STATIC_ASSERT(kSmiTag == 0); |
- DCHECK_EQ(0, Smi::FromInt(0)); |
+ DCHECK_EQ(static_cast<Smi*>(0), Smi::FromInt(0)); |
movl(kScratchRegister, Immediate(kSmiTagMask)); |
andp(kScratchRegister, src1); |
testl(kScratchRegister, src2); |