| Index: src/crankshaft/arm64/lithium-codegen-arm64.cc
|
| diff --git a/src/crankshaft/arm64/lithium-codegen-arm64.cc b/src/crankshaft/arm64/lithium-codegen-arm64.cc
|
| index 43b52c40fa74af20c7f1a24898815feb4091ed3b..abb0e71ea419deb6623ab5300a91dd471582fdc4 100644
|
| --- a/src/crankshaft/arm64/lithium-codegen-arm64.cc
|
| +++ b/src/crankshaft/arm64/lithium-codegen-arm64.cc
|
| @@ -1731,17 +1731,18 @@ void LCodeGen::DoBranch(LBranch* instr) {
|
| __ Ldr(temp, FieldMemOperand(value, String::kLengthOffset));
|
| EmitCompareAndBranch(instr, ne, temp, 0);
|
| } 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.
|
| __ JumpIfRoot(
|
| value, Heap::kUndefinedValueRootIndex, false_label);
|
| }
|
|
|
| - if (expected.Contains(ToBooleanStub::BOOLEAN)) {
|
| + if (expected.Contains(ToBooleanICStub::BOOLEAN)) {
|
| // Boolean -> its value.
|
| __ JumpIfRoot(
|
| value, Heap::kTrueValueRootIndex, true_label);
|
| @@ -1749,13 +1750,13 @@ void LCodeGen::DoBranch(LBranch* instr) {
|
| value, Heap::kFalseValueRootIndex, false_label);
|
| }
|
|
|
| - if (expected.Contains(ToBooleanStub::NULL_TYPE)) {
|
| + if (expected.Contains(ToBooleanICStub::NULL_TYPE)) {
|
| // 'null' -> false.
|
| __ JumpIfRoot(
|
| value, Heap::kNullValueRootIndex, false_label);
|
| }
|
|
|
| - if (expected.Contains(ToBooleanStub::SMI)) {
|
| + if (expected.Contains(ToBooleanICStub::SMI)) {
|
| // Smis: 0 -> false, all other -> true.
|
| DCHECK(Smi::FromInt(0) == 0);
|
| __ Cbz(value, false_label);
|
| @@ -1783,13 +1784,13 @@ void LCodeGen::DoBranch(LBranch* instr) {
|
| }
|
| }
|
|
|
| - if (expected.Contains(ToBooleanStub::SPEC_OBJECT)) {
|
| + if (expected.Contains(ToBooleanICStub::SPEC_OBJECT)) {
|
| // spec object -> true.
|
| __ CompareInstanceType(map, scratch, FIRST_JS_RECEIVER_TYPE);
|
| __ B(ge, true_label);
|
| }
|
|
|
| - if (expected.Contains(ToBooleanStub::STRING)) {
|
| + if (expected.Contains(ToBooleanICStub::STRING)) {
|
| // String value -> false iff empty.
|
| Label not_string;
|
| __ CompareInstanceType(map, scratch, FIRST_NONSTRING_TYPE);
|
| @@ -1800,19 +1801,19 @@ void LCodeGen::DoBranch(LBranch* instr) {
|
| __ Bind(¬_string);
|
| }
|
|
|
| - if (expected.Contains(ToBooleanStub::SYMBOL)) {
|
| + if (expected.Contains(ToBooleanICStub::SYMBOL)) {
|
| // Symbol value -> true.
|
| __ CompareInstanceType(map, scratch, SYMBOL_TYPE);
|
| __ B(eq, true_label);
|
| }
|
|
|
| - if (expected.Contains(ToBooleanStub::SIMD_VALUE)) {
|
| + if (expected.Contains(ToBooleanICStub::SIMD_VALUE)) {
|
| // SIMD value -> true.
|
| __ CompareInstanceType(map, scratch, SIMD128_VALUE_TYPE);
|
| __ B(eq, true_label);
|
| }
|
|
|
| - if (expected.Contains(ToBooleanStub::HEAP_NUMBER)) {
|
| + if (expected.Contains(ToBooleanICStub::HEAP_NUMBER)) {
|
| Label not_heap_number;
|
| __ JumpIfNotRoot(map, Heap::kHeapNumberMapRootIndex, ¬_heap_number);
|
|
|
|
|