Index: src/arm/lithium-codegen-arm.cc |
diff --git a/src/arm/lithium-codegen-arm.cc b/src/arm/lithium-codegen-arm.cc |
index 8d823031a44f3404b8e45f5330c935fa17f76af2..c2790ff2ac6395f283a6937cac2d8c2e9057ff70 100644 |
--- a/src/arm/lithium-codegen-arm.cc |
+++ b/src/arm/lithium-codegen-arm.cc |
@@ -5144,7 +5144,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()); |
@@ -5196,7 +5196,6 @@ void LCodeGen::DoCheckMaps(LCheckMaps* instr) { |
ASSERT(input->IsRegister()); |
Register reg = ToRegister(input); |
- SmallMapList* map_set = instr->hydrogen()->map_set(); |
__ ldr(map_reg, FieldMemOperand(reg, HeapObject::kMapOffset)); |
DeferredCheckMaps* deferred = NULL; |
@@ -5205,14 +5204,15 @@ 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(); |
__ CompareMap(map_reg, map, &success); |
__ b(eq, &success); |
} |
- Handle<Map> map = map_set->last(); |
+ Handle<Map> map = map_set.at(map_set.size() - 1).handle(); |
__ CompareMap(map_reg, map, &success); |
if (instr->hydrogen()->has_migration_target()) { |
__ b(ne, deferred->entry()); |