| Index: src/x64/builtins-x64.cc
|
| diff --git a/src/x64/builtins-x64.cc b/src/x64/builtins-x64.cc
|
| index 561626356efe106c9c40ece10b8957ea55e1dbbb..021f3446a8191235b9e00a0fa0cdd9461a2b7b19 100644
|
| --- a/src/x64/builtins-x64.cc
|
| +++ b/src/x64/builtins-x64.cc
|
| @@ -365,8 +365,8 @@ static void Generate_JSConstructStubHelper(MacroAssembler* masm,
|
| __ JumpIfSmi(rax, &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.
|
| - __ CmpObjectType(rax, FIRST_JS_OBJECT_TYPE, rcx);
|
| + // FIRST_SPEC_OBJECT_TYPE, it is not an object in the ECMA sense.
|
| + __ CmpObjectType(rax, FIRST_SPEC_OBJECT_TYPE, rcx);
|
| __ j(above_equal, &exit);
|
|
|
| // Throw away the result of the constructor invocation and use the
|
| @@ -701,9 +701,8 @@ void Builtins::Generate_FunctionCall(MacroAssembler* masm) {
|
| __ CompareRoot(rbx, Heap::kUndefinedValueRootIndex);
|
| __ j(equal, &use_global_receiver);
|
|
|
| - STATIC_ASSERT(LAST_JS_OBJECT_TYPE + 1 == LAST_TYPE);
|
| - STATIC_ASSERT(LAST_TYPE == JS_FUNCTION_TYPE);
|
| - __ CmpObjectType(rbx, FIRST_JS_OBJECT_TYPE, rcx);
|
| + STATIC_ASSERT(LAST_SPEC_OBJECT_TYPE == LAST_TYPE);
|
| + __ CmpObjectType(rbx, FIRST_SPEC_OBJECT_TYPE, rcx);
|
| __ j(above_equal, &shift_arguments);
|
|
|
| __ bind(&convert_to_object);
|
| @@ -877,9 +876,8 @@ void Builtins::Generate_FunctionApply(MacroAssembler* masm) {
|
|
|
| // If given receiver is already a JavaScript object then there's no
|
| // reason for converting it.
|
| - STATIC_ASSERT(LAST_JS_OBJECT_TYPE + 1 == LAST_TYPE);
|
| - STATIC_ASSERT(LAST_TYPE == JS_FUNCTION_TYPE);
|
| - __ CmpObjectType(rbx, FIRST_JS_OBJECT_TYPE, rcx);
|
| + STATIC_ASSERT(LAST_SPEC_OBJECT_TYPE == LAST_TYPE);
|
| + __ CmpObjectType(rbx, FIRST_SPEC_OBJECT_TYPE, rcx);
|
| __ j(above_equal, &push_receiver);
|
|
|
| // Convert the receiver to an object.
|
|
|