Index: src/crankshaft/x64/lithium-codegen-x64.cc |
diff --git a/src/crankshaft/x64/lithium-codegen-x64.cc b/src/crankshaft/x64/lithium-codegen-x64.cc |
index 20a2fffece04e57ed26ec39ccaea454ebd8e8e7c..35855179df2f4e169301006916848f0ce8749069 100644 |
--- a/src/crankshaft/x64/lithium-codegen-x64.cc |
+++ b/src/crankshaft/x64/lithium-codegen-x64.cc |
@@ -2012,16 +2012,17 @@ void LCodeGen::DoBranch(LBranch* instr) { |
__ cmpp(FieldOperand(reg, String::kLengthOffset), Immediate(0)); |
EmitBranch(instr, not_equal); |
} else { |
- ToBooleanStub::Types expected = instr->hydrogen()->expected_input_types(); |
+ ToBooleanICStub::Types expected = |
+ instr->hydrogen()->expected_input_types(); |
// Avoid deopts in the case where we've never executed this path before. |
- if (expected.IsEmpty()) expected = ToBooleanStub::Types::Generic(); |
+ if (expected.IsEmpty()) expected = ToBooleanICStub::Types::Generic(); |
- if (expected.Contains(ToBooleanStub::UNDEFINED)) { |
+ if (expected.Contains(ToBooleanICStub::UNDEFINED)) { |
// undefined -> false. |
__ CompareRoot(reg, Heap::kUndefinedValueRootIndex); |
__ j(equal, instr->FalseLabel(chunk_)); |
} |
- if (expected.Contains(ToBooleanStub::BOOLEAN)) { |
+ if (expected.Contains(ToBooleanICStub::BOOLEAN)) { |
// true -> true. |
__ CompareRoot(reg, Heap::kTrueValueRootIndex); |
__ j(equal, instr->TrueLabel(chunk_)); |
@@ -2029,13 +2030,13 @@ void LCodeGen::DoBranch(LBranch* instr) { |
__ CompareRoot(reg, Heap::kFalseValueRootIndex); |
__ j(equal, instr->FalseLabel(chunk_)); |
} |
- if (expected.Contains(ToBooleanStub::NULL_TYPE)) { |
+ if (expected.Contains(ToBooleanICStub::NULL_TYPE)) { |
// 'null' -> false. |
__ CompareRoot(reg, Heap::kNullValueRootIndex); |
__ j(equal, instr->FalseLabel(chunk_)); |
} |
- if (expected.Contains(ToBooleanStub::SMI)) { |
+ if (expected.Contains(ToBooleanICStub::SMI)) { |
// Smis: 0 -> false, all other -> true. |
__ Cmp(reg, Smi::FromInt(0)); |
__ j(equal, instr->FalseLabel(chunk_)); |
@@ -2058,13 +2059,13 @@ void LCodeGen::DoBranch(LBranch* instr) { |
} |
} |
- if (expected.Contains(ToBooleanStub::SPEC_OBJECT)) { |
+ if (expected.Contains(ToBooleanICStub::SPEC_OBJECT)) { |
// spec object -> true. |
__ CmpInstanceType(map, FIRST_JS_RECEIVER_TYPE); |
__ j(above_equal, instr->TrueLabel(chunk_)); |
} |
- if (expected.Contains(ToBooleanStub::STRING)) { |
+ if (expected.Contains(ToBooleanICStub::STRING)) { |
// String value -> false iff empty. |
Label not_string; |
__ CmpInstanceType(map, FIRST_NONSTRING_TYPE); |
@@ -2075,19 +2076,19 @@ void LCodeGen::DoBranch(LBranch* instr) { |
__ bind(¬_string); |
} |
- if (expected.Contains(ToBooleanStub::SYMBOL)) { |
+ if (expected.Contains(ToBooleanICStub::SYMBOL)) { |
// Symbol value -> true. |
__ CmpInstanceType(map, SYMBOL_TYPE); |
__ j(equal, instr->TrueLabel(chunk_)); |
} |
- if (expected.Contains(ToBooleanStub::SIMD_VALUE)) { |
+ if (expected.Contains(ToBooleanICStub::SIMD_VALUE)) { |
// SIMD value -> true. |
__ CmpInstanceType(map, SIMD128_VALUE_TYPE); |
__ j(equal, instr->TrueLabel(chunk_)); |
} |
- if (expected.Contains(ToBooleanStub::HEAP_NUMBER)) { |
+ if (expected.Contains(ToBooleanICStub::HEAP_NUMBER)) { |
// heap number -> false iff +0, -0, or NaN. |
Label not_heap_number; |
__ CompareRoot(map, Heap::kHeapNumberMapRootIndex); |