Use a dictionary-mode code cache on the map rather than a dual system.

src/heap/object-stats.cc

 // Copyright 2015 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.
 
 #include "src/heap/object-stats.h"
 
 #include "src/counters.h"
 #include "src/heap/heap-inl.h"
 #include "src/isolate.h"
 #include "src/utils.h"
@@ skipping 169 matching lines @@
   Heap* heap = map->GetHeap();
   Map* map_obj = Map::cast(obj);
   DCHECK(map->instance_type() == MAP_TYPE);
   DescriptorArray* array = map_obj->instance_descriptors();
   if (map_obj->owns_descriptors() && array != heap->empty_descriptor_array()) {
     int fixed_array_size = array->Size();
     heap->object_stats_->RecordFixedArraySubTypeStats(DESCRIPTOR_ARRAY_SUB_TYPE,
                                                       fixed_array_size);
   }
   if (map_obj->has_code_cache()) {
-    CodeCache* cache = CodeCache::cast(map_obj->code_cache());
-    heap->object_stats_->RecordFixedArraySubTypeStats(
-        MAP_CODE_CACHE_SUB_TYPE, cache->default_cache()->Size());
-    if (!cache->normal_type_cache()->IsUndefined()) {
-      heap->object_stats_->RecordFixedArraySubTypeStats(
-          MAP_CODE_CACHE_SUB_TYPE,
-          FixedArray::cast(cache->normal_type_cache())->Size());
-    }
+    FixedArray* cache = FixedArray::cast(map_obj->code_cache());
+    heap->object_stats_->RecordFixedArraySubTypeStats(MAP_CODE_CACHE_SUB_TYPE,
+                                                      cache->Size());
   }
   VisitBase(kVisitMap, map, obj);
 }
 
 
 template <>
 void ObjectStatsVisitor::Visit<ObjectStatsVisitor::kVisitCode>(
     Map* map, HeapObject* obj) {
   Heap* heap = map->GetHeap();
   int object_size = obj->Size();
@@ skipping 35 matching lines @@
   // Copy the original visitor table to make call-through possible. After we
   // preserved a copy locally, we patch the original table to call us.
   table_.CopyFrom(original);
 #define COUNT_FUNCTION(id) original->Register(kVisit##id, Visit<kVisit##id>);
   VISITOR_ID_LIST(COUNT_FUNCTION)
 #undef COUNT_FUNCTION
 }
 
 }  // namespace internal
 }  // namespace v8