Replace HeapType with a non-templated FieldType class.

src/parsing/json-parser.h

 // Copyright 2011 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.
 
 #ifndef V8_PARSING_JSON_PARSER_H_
 #define V8_PARSING_JSON_PARSER_H_
 
 #include "src/char-predicates.h"
 #include "src/conversions.h"
 #include "src/debug/debug.h"
@@ skipping 398 matching lines @@
       if (transitioning) {
         PropertyDetails details =
             target->instance_descriptors()->GetDetails(descriptor);
         Representation expected_representation = details.representation();
 
         if (value->FitsRepresentation(expected_representation)) {
           if (expected_representation.IsHeapObject() &&
               !target->instance_descriptors()
                    ->GetFieldType(descriptor)
                    ->NowContains(value)) {
-            Handle<HeapType> value_type(
+            Handle<FieldType> value_type(
                 value->OptimalType(isolate(), expected_representation));
             Map::GeneralizeFieldType(target, descriptor,
                                      expected_representation, value_type);
           }
           DCHECK(target->instance_descriptors()
                      ->GetFieldType(descriptor)
                      ->NowContains(value));
           properties.Add(value, zone());
           map = target;
           descriptor++;
@@ skipping 403 matching lines @@
   DCHECK_EQ('"', c0_);
   // Advance past the last '"'.
   AdvanceSkipWhitespace();
   return result;
 }
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_PARSING_JSON_PARSER_H_