| Index: src/full-codegen/x87/full-codegen-x87.cc
 | 
| diff --git a/src/full-codegen/x87/full-codegen-x87.cc b/src/full-codegen/x87/full-codegen-x87.cc
 | 
| index 14ae8ee4d5fa29a3984d71307af0668d642d3ba5..1a1f047b644483edcb5fbf2a04e07e90ea112419 100644
 | 
| --- a/src/full-codegen/x87/full-codegen-x87.cc
 | 
| +++ b/src/full-codegen/x87/full-codegen-x87.cc
 | 
| @@ -983,9 +983,8 @@ void FullCodeGenerator::VisitForInStatement(ForInStatement* stmt) {
 | 
|  
 | 
|    // Check for proxies.
 | 
|    Label call_runtime, use_cache, fixed_array;
 | 
| -  STATIC_ASSERT(FIRST_JS_PROXY_TYPE == FIRST_JS_RECEIVER_TYPE);
 | 
| -  __ CmpObjectType(eax, LAST_JS_PROXY_TYPE, ecx);
 | 
| -  __ j(below_equal, &call_runtime);
 | 
| +  __ CmpObjectType(eax, JS_PROXY_TYPE, ecx);
 | 
| +  __ j(equal, &call_runtime);
 | 
|  
 | 
|    // Check cache validity in generated code. This is a fast case for
 | 
|    // the JSObject::IsSimpleEnum cache validity checks. If we cannot
 | 
| @@ -1041,8 +1040,8 @@ void FullCodeGenerator::VisitForInStatement(ForInStatement* stmt) {
 | 
|  
 | 
|    __ mov(ebx, Immediate(Smi::FromInt(1)));  // Smi indicates slow check
 | 
|    __ mov(ecx, Operand(esp, 0 * kPointerSize));  // Get enumerated object
 | 
| -  STATIC_ASSERT(FIRST_JS_PROXY_TYPE == FIRST_JS_RECEIVER_TYPE);
 | 
| -  __ CmpObjectType(ecx, LAST_JS_PROXY_TYPE, ecx);
 | 
| +  STATIC_ASSERT(JS_PROXY_TYPE == FIRST_JS_RECEIVER_TYPE);
 | 
| +  __ CmpObjectType(ecx, JS_PROXY_TYPE, ecx);
 | 
|    __ j(above, &non_proxy);
 | 
|    __ Move(ebx, Immediate(Smi::FromInt(0)));  // Zero indicates proxy
 | 
|    __ bind(&non_proxy);
 | 
| @@ -3139,14 +3138,11 @@ void FullCodeGenerator::EmitIsJSProxy(CallRuntime* expr) {
 | 
|    context()->PrepareTest(&materialize_true, &materialize_false, &if_true,
 | 
|                           &if_false, &fall_through);
 | 
|  
 | 
| +
 | 
|    __ JumpIfSmi(eax, if_false);
 | 
| -  Register map = ebx;
 | 
| -  __ mov(map, FieldOperand(eax, HeapObject::kMapOffset));
 | 
| -  __ CmpInstanceType(map, FIRST_JS_PROXY_TYPE);
 | 
| -  __ j(less, if_false);
 | 
| -  __ CmpInstanceType(map, LAST_JS_PROXY_TYPE);
 | 
| +  __ CmpObjectType(eax, JS_PROXY_TYPE, ebx);
 | 
|    PrepareForBailoutBeforeSplit(expr, true, if_true, if_false);
 | 
| -  Split(less_equal, if_true, if_false, fall_through);
 | 
| +  Split(equal, if_true, if_false, fall_through);
 | 
|  
 | 
|    context()->Plug(if_true, if_false);
 | 
|  }
 | 
| 
 |