Index: src/ic/arm/handler-compiler-arm.cc |
diff --git a/src/ic/arm/handler-compiler-arm.cc b/src/ic/arm/handler-compiler-arm.cc |
index a4c06079051c48cf63f453657d5f34e7f6131a45..3cf3a44afa0aa2ed71f348722c72e88609553f32 100644 |
--- a/src/ic/arm/handler-compiler-arm.cc |
+++ b/src/ic/arm/handler-compiler-arm.cc |
@@ -473,15 +473,14 @@ Register PropertyHandlerCompiler::CheckPrototypes( |
} else { |
Register map_reg = scratch1; |
__ ldr(map_reg, FieldMemOperand(reg, HeapObject::kMapOffset)); |
- if (depth != 1 || check == CHECK_ALL_MAPS) { |
- Handle<WeakCell> cell = Map::WeakCellForMap(current_map); |
- __ CmpWeakValue(map_reg, cell, scratch2); |
- __ b(ne, miss); |
- } |
if (current_map->IsJSGlobalObjectMap()) { |
GenerateCheckPropertyCell(masm(), Handle<JSGlobalObject>::cast(current), |
name, scratch2, miss); |
+ } else if (depth != 1 || check == CHECK_ALL_MAPS) { |
+ Handle<WeakCell> cell = Map::WeakCellForMap(current_map); |
+ __ CmpWeakValue(map_reg, cell, scratch2); |
+ __ b(ne, miss); |
} |
reg = holder_reg; // From now on the object will be in holder_reg. |
@@ -494,6 +493,8 @@ Register PropertyHandlerCompiler::CheckPrototypes( |
current_map = handle(current->map()); |
} |
+ DCHECK(!current_map->IsJSGlobalProxyMap()); |
+ |
// Log the check depth. |
LOG(isolate(), IntEvent("check-maps-depth", depth + 1)); |