Replace HeapType with a non-templated FieldType class.

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

 // Copyright 2014 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #if V8_TARGET_ARCH_ARM
 
 #include "src/ic/call-optimization.h"
 #include "src/ic/handler-compiler.h"
 #include "src/ic/ic.h"
 #include "src/isolate-inl.h"
@@ skipping 376 matching lines @@
   DCHECK(!map_reg.is(scratch));
   DCHECK(!map_reg.is(value_reg));
   DCHECK(!value_reg.is(scratch));
   __ LoadInstanceDescriptors(map_reg, scratch);
   __ ldr(scratch,
          FieldMemOperand(scratch, DescriptorArray::GetValueOffset(descriptor)));
   __ cmp(value_reg, scratch);
   __ 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();
   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();
+  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;
     while (true) {
       __ CmpWeakValue(map_reg, Map::WeakCellForMap(it.Current()), scratch);
       it.Advance();
       if (it.Done()) {
         __ b(ne, miss_label);
         break;
       }
@@ skipping 376 matching lines @@
   // Return the generated code.
   return GetCode(kind(), Code::NORMAL, name);
 }
 
 
 #undef __
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_TARGET_ARCH_ARM