| Index: src/x87/code-stubs-x87.cc
|
| diff --git a/src/x87/code-stubs-x87.cc b/src/x87/code-stubs-x87.cc
|
| index e3eb2764b319c97cb4d0a28381c7259f6e6a02e6..11744ff623e921b3fad1778be2a7e8d7a362133e 100644
|
| --- a/src/x87/code-stubs-x87.cc
|
| +++ b/src/x87/code-stubs-x87.cc
|
| @@ -1377,7 +1377,7 @@ void CompareICStub::GenerateGeneric(MacroAssembler* masm) {
|
| __ mov(ecx, FieldOperand(eax, HeapObject::kMapOffset));
|
| __ movzx_b(ecx, FieldOperand(ecx, Map::kInstanceTypeOffset));
|
| // Call runtime on identical JSObjects. Otherwise return equal.
|
| - __ cmpb(ecx, static_cast<uint8_t>(FIRST_SPEC_OBJECT_TYPE));
|
| + __ cmpb(ecx, static_cast<uint8_t>(FIRST_JS_RECEIVER_TYPE));
|
| __ j(above_equal, &runtime_call, Label::kFar);
|
| // Call runtime on identical symbols since we need to throw a TypeError.
|
| __ cmpb(ecx, static_cast<uint8_t>(SYMBOL_TYPE));
|
| @@ -1445,8 +1445,8 @@ void CompareICStub::GenerateGeneric(MacroAssembler* masm) {
|
| // Get the type of the first operand.
|
| // If the first object is a JS object, we have done pointer comparison.
|
| Label first_non_object;
|
| - STATIC_ASSERT(LAST_TYPE == LAST_SPEC_OBJECT_TYPE);
|
| - __ CmpObjectType(eax, FIRST_SPEC_OBJECT_TYPE, ecx);
|
| + STATIC_ASSERT(LAST_TYPE == LAST_JS_RECEIVER_TYPE);
|
| + __ CmpObjectType(eax, FIRST_JS_RECEIVER_TYPE, ecx);
|
| __ j(below, &first_non_object, Label::kNear);
|
|
|
| // Return non-zero (eax is not zero)
|
| @@ -1460,7 +1460,7 @@ void CompareICStub::GenerateGeneric(MacroAssembler* masm) {
|
| __ CmpInstanceType(ecx, ODDBALL_TYPE);
|
| __ j(equal, &return_not_equal);
|
|
|
| - __ CmpObjectType(edx, FIRST_SPEC_OBJECT_TYPE, ecx);
|
| + __ CmpObjectType(edx, FIRST_JS_RECEIVER_TYPE, ecx);
|
| __ j(above_equal, &return_not_equal);
|
|
|
| // Check for oddballs: true, false, null, undefined.
|
| @@ -1556,9 +1556,9 @@ void CompareICStub::GenerateGeneric(MacroAssembler* masm) {
|
| __ lea(ecx, Operand(eax, edx, times_1, 0));
|
| __ test(ecx, Immediate(kSmiTagMask));
|
| __ j(not_zero, &runtime_call, Label::kNear);
|
| - __ CmpObjectType(eax, FIRST_SPEC_OBJECT_TYPE, ecx);
|
| + __ CmpObjectType(eax, FIRST_JS_RECEIVER_TYPE, ecx);
|
| __ j(below, &runtime_call, Label::kNear);
|
| - __ CmpObjectType(edx, FIRST_SPEC_OBJECT_TYPE, ebx);
|
| + __ CmpObjectType(edx, FIRST_JS_RECEIVER_TYPE, ebx);
|
| __ j(below, &runtime_call, Label::kNear);
|
| // We do not bail out after this point. Both are JSObjects, and
|
| // they are equal if and only if both are undetectable.
|
| @@ -5070,7 +5070,7 @@ static void CallApiFunctionAndReturn(MacroAssembler* masm,
|
| __ CmpInstanceType(map, LAST_NAME_TYPE);
|
| __ j(below_equal, &ok, Label::kNear);
|
|
|
| - __ CmpInstanceType(map, FIRST_SPEC_OBJECT_TYPE);
|
| + __ CmpInstanceType(map, FIRST_JS_RECEIVER_TYPE);
|
| __ j(above_equal, &ok, Label::kNear);
|
|
|
| __ cmp(map, isolate->factory()->heap_number_map());
|
|
|