Index: src/ic/x87/handler-compiler-x87.cc |
diff --git a/src/ic/x87/handler-compiler-x87.cc b/src/ic/x87/handler-compiler-x87.cc |
index 2ff35954c89a95e3e13815de1c0c718d5d247623..f3c87448c29b21c533db29e6af7d96087c7d3bdb 100644 |
--- a/src/ic/x87/handler-compiler-x87.cc |
+++ b/src/ic/x87/handler-compiler-x87.cc |
@@ -385,12 +385,17 @@ void NamedStoreHandlerCompiler::GenerateConstantCheck(Register map_reg, |
void NamedStoreHandlerCompiler::GenerateFieldTypeChecks(HeapType* field_type, |
Register value_reg, |
Label* miss_label) { |
+ Register map_reg = scratch1(); |
+ Register scratch = scratch2(); |
+ DCHECK(!value_reg.is(map_reg)); |
+ DCHECK(!value_reg.is(scratch)); |
__ JumpIfSmi(value_reg, miss_label); |
HeapType::Iterator<Map> it = field_type->Classes(); |
if (!it.Done()) { |
Label do_store; |
+ __ mov(map_reg, FieldOperand(value_reg, HeapObject::kMapOffset)); |
while (true) { |
- __ CompareMap(value_reg, it.Current()); |
+ __ CmpWeakValue(map_reg, Map::WeakCellForMap(it.Current()), scratch); |
it.Advance(); |
if (it.Done()) { |
__ j(not_equal, miss_label); |