Index: src/x87/stub-cache-x87.cc |
diff --git a/src/x87/stub-cache-x87.cc b/src/x87/stub-cache-x87.cc |
index 98d55f2ba3d100d0badeefd18cba931665069746..f4fd75b01fe728be29b83f41ba1a90cac8e7a90b 100644 |
--- a/src/x87/stub-cache-x87.cc |
+++ b/src/x87/stub-cache-x87.cc |
@@ -822,6 +822,11 @@ Register StubCompiler::CheckPrototypes(Handle<HeapType> type, |
__ mov(reg, FieldOperand(scratch1, Map::kPrototypeOffset)); |
} else { |
bool in_new_space = heap()->InNewSpace(*prototype); |
+ // Two possible reasons for loading the prototype from the map: |
+ // (1) Can't store references to new space in code. |
+ // (2) Handler is shared for all receivers with the same prototype |
+ // map (but not necessarily the same prototype instance). |
+ bool load_prototype_from_map = in_new_space || depth == 1; |
if (depth != 1 || check == CHECK_ALL_MAPS) { |
__ CheckMap(reg, current_map, miss, DONT_DO_SMI_CHECK); |
} |
@@ -837,19 +842,16 @@ Register StubCompiler::CheckPrototypes(Handle<HeapType> type, |
scratch2, miss); |
} |
- if (in_new_space) { |
+ if (load_prototype_from_map) { |
// Save the map in scratch1 for later. |
__ mov(scratch1, FieldOperand(reg, HeapObject::kMapOffset)); |
} |
reg = holder_reg; // From now on the object will be in holder_reg. |
- if (in_new_space) { |
- // The prototype is in new space; we cannot store a reference to it |
- // in the code. Load it from the map. |
+ if (load_prototype_from_map) { |
__ mov(reg, FieldOperand(scratch1, Map::kPrototypeOffset)); |
} else { |
- // The prototype is in old space; load it directly. |
__ mov(reg, prototype); |
} |
} |