| Index: src/crankshaft/arm/lithium-codegen-arm.cc
|
| diff --git a/src/crankshaft/arm/lithium-codegen-arm.cc b/src/crankshaft/arm/lithium-codegen-arm.cc
|
| index d6eb69a6fd1fdf4d21fb9be8c846a38fb87afd0a..b2de78a8394798c714928e1f4e4c77a674b2f8cf 100644
|
| --- a/src/crankshaft/arm/lithium-codegen-arm.cc
|
| +++ b/src/crankshaft/arm/lithium-codegen-arm.cc
|
| @@ -2058,45 +2058,44 @@ void LCodeGen::DoBranch(LBranch* instr) {
|
| __ cmp(ip, Operand::Zero());
|
| EmitBranch(instr, ne);
|
| } else {
|
| - ToBooleanICStub::Types expected =
|
| - instr->hydrogen()->expected_input_types();
|
| + ToBooleanHints expected = instr->hydrogen()->expected_input_types();
|
| // Avoid deopts in the case where we've never executed this path before.
|
| - if (expected.IsEmpty()) expected = ToBooleanICStub::Types::Generic();
|
| + if (expected == ToBooleanHint::kNone) expected = ToBooleanHint::kAny;
|
|
|
| - if (expected.Contains(ToBooleanICStub::UNDEFINED)) {
|
| + if (expected & ToBooleanHint::kUndefined) {
|
| // undefined -> false.
|
| __ CompareRoot(reg, Heap::kUndefinedValueRootIndex);
|
| __ b(eq, instr->FalseLabel(chunk_));
|
| }
|
| - if (expected.Contains(ToBooleanICStub::BOOLEAN)) {
|
| + if (expected & ToBooleanHint::kBoolean) {
|
| // Boolean -> its value.
|
| __ CompareRoot(reg, Heap::kTrueValueRootIndex);
|
| __ b(eq, instr->TrueLabel(chunk_));
|
| __ CompareRoot(reg, Heap::kFalseValueRootIndex);
|
| __ b(eq, instr->FalseLabel(chunk_));
|
| }
|
| - if (expected.Contains(ToBooleanICStub::NULL_TYPE)) {
|
| + if (expected & ToBooleanHint::kNull) {
|
| // 'null' -> false.
|
| __ CompareRoot(reg, Heap::kNullValueRootIndex);
|
| __ b(eq, instr->FalseLabel(chunk_));
|
| }
|
|
|
| - if (expected.Contains(ToBooleanICStub::SMI)) {
|
| + if (expected & ToBooleanHint::kSmallInteger) {
|
| // Smis: 0 -> false, all other -> true.
|
| __ cmp(reg, Operand::Zero());
|
| __ b(eq, instr->FalseLabel(chunk_));
|
| __ JumpIfSmi(reg, instr->TrueLabel(chunk_));
|
| - } else if (expected.NeedsMap()) {
|
| + } else if (expected & ToBooleanHint::kNeedsMap) {
|
| // If we need a map later and have a Smi -> deopt.
|
| __ SmiTst(reg);
|
| DeoptimizeIf(eq, instr, DeoptimizeReason::kSmi);
|
| }
|
|
|
| const Register map = scratch0();
|
| - if (expected.NeedsMap()) {
|
| + if (expected & ToBooleanHint::kNeedsMap) {
|
| __ ldr(map, FieldMemOperand(reg, HeapObject::kMapOffset));
|
|
|
| - if (expected.CanBeUndetectable()) {
|
| + if (expected & ToBooleanHint::kCanBeUndetectable) {
|
| // Undetectable -> false.
|
| __ ldrb(ip, FieldMemOperand(map, Map::kBitFieldOffset));
|
| __ tst(ip, Operand(1 << Map::kIsUndetectable));
|
| @@ -2104,13 +2103,13 @@ void LCodeGen::DoBranch(LBranch* instr) {
|
| }
|
| }
|
|
|
| - if (expected.Contains(ToBooleanICStub::SPEC_OBJECT)) {
|
| + if (expected & ToBooleanHint::kReceiver) {
|
| // spec object -> true.
|
| __ CompareInstanceType(map, ip, FIRST_JS_RECEIVER_TYPE);
|
| __ b(ge, instr->TrueLabel(chunk_));
|
| }
|
|
|
| - if (expected.Contains(ToBooleanICStub::STRING)) {
|
| + if (expected & ToBooleanHint::kString) {
|
| // String value -> false iff empty.
|
| Label not_string;
|
| __ CompareInstanceType(map, ip, FIRST_NONSTRING_TYPE);
|
| @@ -2122,19 +2121,19 @@ void LCodeGen::DoBranch(LBranch* instr) {
|
| __ bind(¬_string);
|
| }
|
|
|
| - if (expected.Contains(ToBooleanICStub::SYMBOL)) {
|
| + if (expected & ToBooleanHint::kSymbol) {
|
| // Symbol value -> true.
|
| __ CompareInstanceType(map, ip, SYMBOL_TYPE);
|
| __ b(eq, instr->TrueLabel(chunk_));
|
| }
|
|
|
| - if (expected.Contains(ToBooleanICStub::SIMD_VALUE)) {
|
| + if (expected & ToBooleanHint::kSimdValue) {
|
| // SIMD value -> true.
|
| __ CompareInstanceType(map, ip, SIMD128_VALUE_TYPE);
|
| __ b(eq, instr->TrueLabel(chunk_));
|
| }
|
|
|
| - if (expected.Contains(ToBooleanICStub::HEAP_NUMBER)) {
|
| + if (expected & ToBooleanHint::kHeapNumber) {
|
| // heap number -> false iff +0, -0, or NaN.
|
| DwVfpRegister dbl_scratch = double_scratch0();
|
| Label not_heap_number;
|
| @@ -2148,7 +2147,7 @@ void LCodeGen::DoBranch(LBranch* instr) {
|
| __ bind(¬_heap_number);
|
| }
|
|
|
| - if (!expected.IsGeneric()) {
|
| + if (expected != ToBooleanHint::kAny) {
|
| // We've seen something for the first time -> deopt.
|
| // This can only happen if we are not generic already.
|
| DeoptimizeIf(al, instr, DeoptimizeReason::kUnexpectedObject);
|
|
|