Index: src/arm/ic-arm.cc |
diff --git a/src/arm/ic-arm.cc b/src/arm/ic-arm.cc |
index 8749eea5b247ccc1f1a80562f302112f5653cc2a..f8a3a015b2b503676f347ac8a32025b0ce9ff7a9 100644 |
--- a/src/arm/ic-arm.cc |
+++ b/src/arm/ic-arm.cc |
@@ -83,11 +83,11 @@ static void GenerateStringDictionaryReceiverCheck(MacroAssembler* masm, |
__ b(eq, miss); |
// Check that the receiver is a valid JS object. |
- __ CompareObjectType(receiver, t0, t1, FIRST_JS_OBJECT_TYPE); |
+ __ CompareObjectType(receiver, t0, t1, FIRST_OBJECT_OR_FUNCTION_CLASS_TYPE); |
__ b(lt, miss); |
// If this assert fails, we have to check upper bound too. |
- ASSERT(LAST_TYPE == JS_FUNCTION_TYPE); |
+ ASSERT(LAST_TYPE == LAST_OBJECT_OR_FUNCTION_CLASS_TYPE); |
GenerateGlobalInstanceTypeCheck(masm, t1, miss); |
@@ -1212,8 +1212,12 @@ void KeyedStoreIC::GenerateGeneric(MacroAssembler* masm, |
__ cmp(r4, Operand(JS_ARRAY_TYPE)); |
__ b(eq, &array); |
// Check that the object is some kind of JS object. |
- __ cmp(r4, Operand(FIRST_JS_OBJECT_TYPE)); |
+ __ cmp(r4, Operand(FIRST_JS_RECEIVER_TYPE)); |
__ b(lt, &slow); |
+ __ cmp(r4, Operand(JS_PROXY_TYPE)); |
+ __ b(eq, &slow); |
+ __ cmp(r4, Operand(JS_FUNCTION_PROXY_TYPE)); |
+ __ b(eq, &slow); |
// Object case: Check key against length in the elements array. |
__ ldr(elements, FieldMemOperand(receiver, JSObject::kElementsOffset)); |