| Index: src/arm/builtins-arm.cc
|
| diff --git a/src/arm/builtins-arm.cc b/src/arm/builtins-arm.cc
|
| index ef81f04c2167241e04d03d9c73808e74111472c0..34381bee2f192e89f62de080958928a6a841d623 100644
|
| --- a/src/arm/builtins-arm.cc
|
| +++ b/src/arm/builtins-arm.cc
|
| @@ -953,8 +953,8 @@ static void Generate_JSConstructStubHelper(MacroAssembler* masm,
|
| __ b(eq, &use_receiver);
|
|
|
| // If the type of the result (stored in its map) is less than
|
| - // FIRST_JS_OBJECT_TYPE, it is not an object in the ECMA sense.
|
| - __ CompareObjectType(r0, r3, r3, FIRST_JS_OBJECT_TYPE);
|
| + // FIRST_SPEC_OBJECT_TYPE, it is not an object in the ECMA sense.
|
| + __ CompareObjectType(r0, r3, r3, FIRST_SPEC_OBJECT_TYPE);
|
| __ b(ge, &exit);
|
|
|
| // Throw away the result of the constructor invocation and use the
|
| @@ -1289,9 +1289,8 @@ void Builtins::Generate_FunctionCall(MacroAssembler* masm) {
|
| __ cmp(r2, r3);
|
| __ b(eq, &use_global_receiver);
|
|
|
| - STATIC_ASSERT(LAST_JS_OBJECT_TYPE + 1 == LAST_TYPE);
|
| - STATIC_ASSERT(LAST_TYPE == JS_FUNCTION_TYPE);
|
| - __ CompareObjectType(r2, r3, r3, FIRST_JS_OBJECT_TYPE);
|
| + STATIC_ASSERT(LAST_SPEC_OBJECT_TYPE == LAST_TYPE);
|
| + __ CompareObjectType(r2, r3, r3, FIRST_SPEC_OBJECT_TYPE);
|
| __ b(ge, &shift_arguments);
|
|
|
| __ bind(&convert_to_object);
|
| @@ -1477,9 +1476,8 @@ void Builtins::Generate_FunctionApply(MacroAssembler* masm) {
|
|
|
| // Check if the receiver is already a JavaScript object.
|
| // r0: receiver
|
| - STATIC_ASSERT(LAST_JS_OBJECT_TYPE + 1 == LAST_TYPE);
|
| - STATIC_ASSERT(LAST_TYPE == JS_FUNCTION_TYPE);
|
| - __ CompareObjectType(r0, r1, r1, FIRST_JS_OBJECT_TYPE);
|
| + STATIC_ASSERT(LAST_SPEC_OBJECT_TYPE == LAST_TYPE);
|
| + __ CompareObjectType(r0, r1, r1, FIRST_SPEC_OBJECT_TYPE);
|
| __ b(ge, &push_receiver);
|
|
|
| // Convert the receiver to a regular object.
|
|
|