Index: src/mips/lithium-codegen-mips.cc |
diff --git a/src/mips/lithium-codegen-mips.cc b/src/mips/lithium-codegen-mips.cc |
index 3518f137a638ce6d7be42fce23f956999f118ccd..48d67a48c58c3488ae4f89116d5af61d88139e29 100644 |
--- a/src/mips/lithium-codegen-mips.cc |
+++ b/src/mips/lithium-codegen-mips.cc |
@@ -5105,7 +5105,7 @@ void LCodeGen::DoCheckInstanceType(LCheckInstanceType* instr) { |
void LCodeGen::DoCheckValue(LCheckValue* instr) { |
Register reg = ToRegister(instr->value()); |
- Handle<HeapObject> object = instr->hydrogen()->object(); |
+ Handle<HeapObject> object = instr->hydrogen()->object().handle(); |
AllowDeferredHandleDereference smi_check; |
if (isolate()->heap()->InNewSpace(*object)) { |
Register reg = ToRegister(instr->value()); |
@@ -5156,7 +5156,6 @@ void LCodeGen::DoCheckMaps(LCheckMaps* instr) { |
LOperand* input = instr->value(); |
ASSERT(input->IsRegister()); |
Register reg = ToRegister(input); |
- SmallMapList* map_set = instr->hydrogen()->map_set(); |
__ lw(map_reg, FieldMemOperand(reg, HeapObject::kMapOffset)); |
DeferredCheckMaps* deferred = NULL; |
@@ -5165,12 +5164,13 @@ void LCodeGen::DoCheckMaps(LCheckMaps* instr) { |
__ bind(deferred->check_maps()); |
} |
+ UniqueSet<Map> map_set = instr->hydrogen()->map_set(); |
Label success; |
- for (int i = 0; i < map_set->length() - 1; i++) { |
- Handle<Map> map = map_set->at(i); |
+ for (int i = 0; i < map_set.size() - 1; i++) { |
+ Handle<Map> map = map_set.at(i).handle(); |
__ CompareMapAndBranch(map_reg, map, &success, eq, &success); |
} |
- Handle<Map> map = map_set->last(); |
+ Handle<Map> map = map_set.at(map_set.size() - 1).handle(); |
// Do the CompareMap() directly within the Branch() and DeoptimizeIf(). |
if (instr->hydrogen()->has_migration_target()) { |
__ Branch(deferred->entry(), ne, map_reg, Operand(map)); |