| Index: src/mips/stub-cache-mips.cc
|
| diff --git a/src/mips/stub-cache-mips.cc b/src/mips/stub-cache-mips.cc
|
| index 2cd61f98c66e194712b68c0e86d85f8700a71068..59dc9051328c4c0adc5972dde191b221e8bbc850 100644
|
| --- a/src/mips/stub-cache-mips.cc
|
| +++ b/src/mips/stub-cache-mips.cc
|
| @@ -415,13 +415,24 @@ void StoreStubCompiler::GenerateStoreTransition(MacroAssembler* masm,
|
| } else if (representation.IsSmi()) {
|
| __ JumpIfNotSmi(value_reg, miss_label);
|
| } else if (representation.IsHeapObject()) {
|
| + __ JumpIfSmi(value_reg, miss_label);
|
| HeapType* field_type = descriptors->GetFieldType(descriptor);
|
| - if (field_type->IsClass()) {
|
| - __ CheckMap(value_reg, scratch1, field_type->AsClass()->Map(),
|
| - miss_label, DO_SMI_CHECK);
|
| - } else {
|
| - ASSERT(HeapType::Any()->Is(field_type));
|
| - __ JumpIfSmi(value_reg, miss_label);
|
| + HeapType::Iterator<Map> it = field_type->Classes();
|
| + Handle<Map> current;
|
| + if (!it.Done()) {
|
| + __ lw(scratch1, FieldMemOperand(value_reg, HeapObject::kMapOffset));
|
| + Label do_store;
|
| + while (true) {
|
| + // Do the CompareMap() directly within the Branch() functions.
|
| + current = it.Current();
|
| + it.Advance();
|
| + if (it.Done()) {
|
| + __ Branch(miss_label, ne, scratch1, Operand(current));
|
| + break;
|
| + }
|
| + __ Branch(&do_store, eq, scratch1, Operand(current));
|
| + }
|
| + __ bind(&do_store);
|
| }
|
| } else if (representation.IsDouble()) {
|
| Label do_store, heap_number;
|
| @@ -585,13 +596,24 @@ void StoreStubCompiler::GenerateStoreField(MacroAssembler* masm,
|
| if (representation.IsSmi()) {
|
| __ JumpIfNotSmi(value_reg, miss_label);
|
| } else if (representation.IsHeapObject()) {
|
| + __ JumpIfSmi(value_reg, miss_label);
|
| HeapType* field_type = lookup->GetFieldType();
|
| - if (field_type->IsClass()) {
|
| - __ CheckMap(value_reg, scratch1, field_type->AsClass()->Map(),
|
| - miss_label, DO_SMI_CHECK);
|
| - } else {
|
| - ASSERT(HeapType::Any()->Is(field_type));
|
| - __ JumpIfSmi(value_reg, miss_label);
|
| + HeapType::Iterator<Map> it = field_type->Classes();
|
| + if (!it.Done()) {
|
| + __ lw(scratch1, FieldMemOperand(value_reg, HeapObject::kMapOffset));
|
| + Label do_store;
|
| + Handle<Map> current;
|
| + while (true) {
|
| + // Do the CompareMap() directly within the Branch() functions.
|
| + current = it.Current();
|
| + it.Advance();
|
| + if (it.Done()) {
|
| + __ Branch(miss_label, ne, scratch1, Operand(current));
|
| + break;
|
| + }
|
| + __ Branch(&do_store, eq, scratch1, Operand(current));
|
| + }
|
| + __ bind(&do_store);
|
| }
|
| } else if (representation.IsDouble()) {
|
| // Load the double storage.
|
|
|