Index: src/full-codegen/arm/full-codegen-arm.cc |
diff --git a/src/full-codegen/arm/full-codegen-arm.cc b/src/full-codegen/arm/full-codegen-arm.cc |
index 475b0ace6eade4d9081ce3bdc1bdba230ff77bfc..701e7fb031fd91c94cb48600313c43044f57b574 100644 |
--- a/src/full-codegen/arm/full-codegen-arm.cc |
+++ b/src/full-codegen/arm/full-codegen-arm.cc |
@@ -120,7 +120,7 @@ void FullCodeGenerator::Generate() { |
int receiver_offset = info->scope()->num_parameters() * kPointerSize; |
__ ldr(r2, MemOperand(sp, receiver_offset)); |
__ AssertNotSmi(r2); |
- __ CompareObjectType(r2, r2, no_reg, FIRST_SPEC_OBJECT_TYPE); |
+ __ CompareObjectType(r2, r2, no_reg, FIRST_JS_RECEIVER_TYPE); |
__ Assert(ge, kSloppyFunctionExpectsJSReceiverReceiver); |
} |
@@ -1041,7 +1041,7 @@ void FullCodeGenerator::VisitForInStatement(ForInStatement* stmt) { |
// Convert the object to a JS object. |
Label convert, done_convert; |
__ JumpIfSmi(r0, &convert); |
- __ CompareObjectType(r0, r1, r1, FIRST_SPEC_OBJECT_TYPE); |
+ __ CompareObjectType(r0, r1, r1, FIRST_JS_RECEIVER_TYPE); |
__ b(ge, &done_convert); |
__ bind(&convert); |
ToObjectStub stub(isolate()); |
@@ -1052,7 +1052,7 @@ void FullCodeGenerator::VisitForInStatement(ForInStatement* stmt) { |
// Check for proxies. |
Label call_runtime; |
- STATIC_ASSERT(FIRST_JS_PROXY_TYPE == FIRST_SPEC_OBJECT_TYPE); |
+ STATIC_ASSERT(FIRST_JS_PROXY_TYPE == FIRST_JS_RECEIVER_TYPE); |
__ CompareObjectType(r0, r1, r1, LAST_JS_PROXY_TYPE); |
__ b(le, &call_runtime); |
@@ -1117,7 +1117,7 @@ void FullCodeGenerator::VisitForInStatement(ForInStatement* stmt) { |
__ mov(r1, Operand(Smi::FromInt(1))); // Smi indicates slow check |
__ ldr(r2, MemOperand(sp, 0 * kPointerSize)); // Get enumerated object |
- STATIC_ASSERT(FIRST_JS_PROXY_TYPE == FIRST_SPEC_OBJECT_TYPE); |
+ STATIC_ASSERT(FIRST_JS_PROXY_TYPE == FIRST_JS_RECEIVER_TYPE); |
__ CompareObjectType(r2, r3, r3, LAST_JS_PROXY_TYPE); |
__ b(gt, &non_proxy); |
__ mov(r1, Operand(Smi::FromInt(0))); // Zero indicates proxy |
@@ -3108,7 +3108,7 @@ void FullCodeGenerator::EmitIsSpecObject(CallRuntime* expr) { |
&if_true, &if_false, &fall_through); |
__ JumpIfSmi(r0, if_false); |
- __ CompareObjectType(r0, r1, r1, FIRST_SPEC_OBJECT_TYPE); |
+ __ CompareObjectType(r0, r1, r1, FIRST_JS_RECEIVER_TYPE); |
PrepareForBailoutBeforeSplit(expr, true, if_true, if_false); |
Split(ge, if_true, if_false, fall_through); |
@@ -3380,16 +3380,16 @@ void FullCodeGenerator::EmitClassOf(CallRuntime* expr) { |
// Assume that there are only two callable types, and one of them is at |
// either end of the type range for JS object types. Saves extra comparisons. |
STATIC_ASSERT(NUM_OF_CALLABLE_SPEC_OBJECT_TYPES == 2); |
- __ CompareObjectType(r0, r0, r1, FIRST_SPEC_OBJECT_TYPE); |
+ __ CompareObjectType(r0, r0, r1, FIRST_JS_RECEIVER_TYPE); |
// Map is now in r0. |
__ b(lt, &null); |
STATIC_ASSERT(FIRST_NONCALLABLE_SPEC_OBJECT_TYPE == |
- FIRST_SPEC_OBJECT_TYPE + 1); |
+ FIRST_JS_RECEIVER_TYPE + 1); |
__ b(eq, &function); |
- __ cmp(r1, Operand(LAST_SPEC_OBJECT_TYPE)); |
+ __ cmp(r1, Operand(LAST_JS_RECEIVER_TYPE)); |
STATIC_ASSERT(LAST_NONCALLABLE_SPEC_OBJECT_TYPE == |
- LAST_SPEC_OBJECT_TYPE - 1); |
+ LAST_JS_RECEIVER_TYPE - 1); |
__ b(eq, &function); |
// Assume that there is no larger type. |
STATIC_ASSERT(LAST_NONCALLABLE_SPEC_OBJECT_TYPE == LAST_TYPE - 1); |
@@ -4632,8 +4632,8 @@ void FullCodeGenerator::EmitLiteralCompareTypeof(Expression* expr, |
__ JumpIfSmi(r0, if_false); |
__ CompareRoot(r0, Heap::kNullValueRootIndex); |
__ b(eq, if_true); |
- STATIC_ASSERT(LAST_SPEC_OBJECT_TYPE == LAST_TYPE); |
- __ CompareObjectType(r0, r0, r1, FIRST_SPEC_OBJECT_TYPE); |
+ STATIC_ASSERT(LAST_JS_RECEIVER_TYPE == LAST_TYPE); |
+ __ CompareObjectType(r0, r0, r1, FIRST_JS_RECEIVER_TYPE); |
__ b(lt, if_false); |
// Check for callable or undetectable objects => false. |
__ ldrb(r1, FieldMemOperand(r0, Map::kBitFieldOffset)); |