| 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 bff9c043016c5c3c95d5b415b4fea0facfc72f7b..51d1aeeff0b2190d00b3dea6e34d40667b3da9d0 100644
|
| --- a/src/crankshaft/arm64/lithium-codegen-arm64.cc
|
| +++ b/src/crankshaft/arm64/lithium-codegen-arm64.cc
|
| @@ -1886,7 +1886,7 @@ void LCodeGen::DoBranch(LBranch* instr) {
|
|
|
| if (expected.Contains(ToBooleanStub::SPEC_OBJECT)) {
|
| // spec object -> true.
|
| - __ CompareInstanceType(map, scratch, FIRST_SPEC_OBJECT_TYPE);
|
| + __ CompareInstanceType(map, scratch, FIRST_JS_RECEIVER_TYPE);
|
| __ B(ge, true_label);
|
| }
|
|
|
| @@ -2320,16 +2320,16 @@ void LCodeGen::DoClassOfTestAndBranch(LClassOfTestAndBranch* instr) {
|
| // for both being a function type and being in the object type range.
|
| STATIC_ASSERT(NUM_OF_CALLABLE_SPEC_OBJECT_TYPES == 2);
|
| STATIC_ASSERT(FIRST_NONCALLABLE_SPEC_OBJECT_TYPE ==
|
| - FIRST_SPEC_OBJECT_TYPE + 1);
|
| + FIRST_JS_RECEIVER_TYPE + 1);
|
| STATIC_ASSERT(LAST_NONCALLABLE_SPEC_OBJECT_TYPE ==
|
| - LAST_SPEC_OBJECT_TYPE - 1);
|
| - STATIC_ASSERT(LAST_SPEC_OBJECT_TYPE == LAST_TYPE);
|
| + LAST_JS_RECEIVER_TYPE - 1);
|
| + STATIC_ASSERT(LAST_JS_RECEIVER_TYPE == LAST_TYPE);
|
|
|
| // We expect CompareObjectType to load the object instance type in scratch1.
|
| - __ CompareObjectType(input, map, scratch1, FIRST_SPEC_OBJECT_TYPE);
|
| + __ CompareObjectType(input, map, scratch1, FIRST_JS_RECEIVER_TYPE);
|
| __ B(lt, false_label);
|
| __ B(eq, true_label);
|
| - __ Cmp(scratch1, LAST_SPEC_OBJECT_TYPE);
|
| + __ Cmp(scratch1, LAST_JS_RECEIVER_TYPE);
|
| __ B(eq, true_label);
|
| } else {
|
| __ IsObjectJSObjectType(input, map, scratch1, false_label);
|
| @@ -2826,7 +2826,7 @@ void LCodeGen::DoForInPrepareMap(LForInPrepareMap* instr) {
|
|
|
| DeoptimizeIfSmi(object, instr, Deoptimizer::kSmi);
|
|
|
| - STATIC_ASSERT(FIRST_JS_PROXY_TYPE == FIRST_SPEC_OBJECT_TYPE);
|
| + STATIC_ASSERT(FIRST_JS_PROXY_TYPE == FIRST_JS_RECEIVER_TYPE);
|
| __ CompareObjectType(object, x1, x1, LAST_JS_PROXY_TYPE);
|
| DeoptimizeIf(le, instr, Deoptimizer::kNotAJavaScriptObject);
|
|
|
| @@ -5719,8 +5719,8 @@ void LCodeGen::DoTypeofIsAndBranch(LTypeofIsAndBranch* instr) {
|
|
|
| __ JumpIfSmi(value, false_label);
|
| __ JumpIfRoot(value, Heap::kNullValueRootIndex, true_label);
|
| - STATIC_ASSERT(LAST_SPEC_OBJECT_TYPE == LAST_TYPE);
|
| - __ JumpIfObjectType(value, map, scratch, FIRST_SPEC_OBJECT_TYPE,
|
| + STATIC_ASSERT(LAST_JS_RECEIVER_TYPE == LAST_TYPE);
|
| + __ JumpIfObjectType(value, map, scratch, FIRST_JS_RECEIVER_TYPE,
|
| false_label, lt);
|
| // Check for callable or undetectable objects => false.
|
| __ Ldrb(scratch, FieldMemOperand(map, Map::kBitFieldOffset));
|
| @@ -5793,7 +5793,7 @@ void LCodeGen::DoWrapReceiver(LWrapReceiver* instr) {
|
|
|
| // Deoptimize if the receiver is not a JS object.
|
| DeoptimizeIfSmi(receiver, instr, Deoptimizer::kSmi);
|
| - __ CompareObjectType(receiver, result, result, FIRST_SPEC_OBJECT_TYPE);
|
| + __ CompareObjectType(receiver, result, result, FIRST_JS_RECEIVER_TYPE);
|
| __ B(ge, ©_receiver);
|
| Deoptimize(instr, Deoptimizer::kNotAJavaScriptObject);
|
|
|
|
|