Replace HeapType with a non-templated FieldType class.

src/ic/arm/handler-compiler-arm.cc

Index: src/ic/arm/handler-compiler-arm.cc
diff --git a/src/ic/arm/handler-compiler-arm.cc b/src/ic/arm/handler-compiler-arm.cc
index 4cdfb825fb4e8ef68d3d277a7211b6a6b55ddc6e..08710d0de1d36eb5a9983d9e901416cac56a9fa5 100644
--- a/src/ic/arm/handler-compiler-arm.cc
+++ b/src/ic/arm/handler-compiler-arm.cc
@@ -394,8 +394,7 @@ void NamedStoreHandlerCompiler::GenerateConstantCheck(Register map_reg,
   __ b(ne, miss_label);
 }
 
-
-void NamedStoreHandlerCompiler::GenerateFieldTypeChecks(HeapType* field_type,
+void NamedStoreHandlerCompiler::GenerateFieldTypeChecks(FieldType* field_type,
                                                         Register value_reg,
                                                         Label* miss_label) {
   Register map_reg = scratch1();
@@ -403,7 +402,7 @@ void NamedStoreHandlerCompiler::GenerateFieldTypeChecks(HeapType* field_type,
   DCHECK(!value_reg.is(map_reg));
   DCHECK(!value_reg.is(scratch));
   __ JumpIfSmi(value_reg, miss_label);
-  HeapType::Iterator<Map> it = field_type->Classes();
+  FieldType::Iterator it = field_type->Classes();

[Benedikt Meurer, 2016/01/26 14:22:47]

No Iterator please, assume there's only 0 or 1 map in the field type, and
simplify everything accordingly.

[Jarin, 2016/01/26 14:30:41]

The Iterator will go away in the next CL.

   if (!it.Done()) {
     __ ldr(map_reg, FieldMemOperand(value_reg, HeapObject::kMapOffset));
     Label do_store;