Revert of [heap] Separate out optimized code map processing.

src/heap/gc-tracer.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.
 
 #include "src/heap/gc-tracer.h"
 
 #include "src/counters.h"
 #include "src/heap/heap-inl.h"
 #include "src/isolate.h"
 
@@ skipping 474 matching lines @@
                    "mark_inc=%.1f "
                    "mark_prepcodeflush=%.1f "
                    "mark_root=%.1f "
                    "mark_topopt=%.1f "
                    "mark_retainmaps=%.1f "
                    "mark_weakclosure=%.1f "
                    "mark_stringtable=%.1f "
                    "mark_weakrefs=%.1f "
                    "mark_globalhandles=%.1f "
                    "mark_codeflush=%.1f "
-                   "mark_optimizedcodemaps=%.1f "
                    "store_buffer_clear=%.1f "
                    "slots_buffer_clear=%.1f "
                    "sweep=%.2f "
                    "sweepns=%.2f "
                    "sweepos=%.2f "
                    "sweepcode=%.2f "
                    "sweepcell=%.2f "
                    "sweepmap=%.2f "
                    "sweepaborted=%.2f "
                    "evacuate=%.1f "
@@ skipping 46 matching lines @@
                    current_.scopes[Scope::MC_MARK_FINISH_INCREMENTAL],
                    current_.scopes[Scope::MC_MARK_PREPARE_CODE_FLUSH],
                    current_.scopes[Scope::MC_MARK_ROOT],
                    current_.scopes[Scope::MC_MARK_TOPOPT],
                    current_.scopes[Scope::MC_MARK_RETAIN_MAPS],
                    current_.scopes[Scope::MC_MARK_WEAK_CLOSURE],
                    current_.scopes[Scope::MC_MARK_STRING_TABLE],
                    current_.scopes[Scope::MC_MARK_WEAK_REFERENCES],
                    current_.scopes[Scope::MC_MARK_GLOBAL_HANDLES],
                    current_.scopes[Scope::MC_MARK_CODE_FLUSH],
-                   current_.scopes[Scope::MC_MARK_OPTIMIZED_CODE_MAPS],
                    current_.scopes[Scope::MC_STORE_BUFFER_CLEAR],
                    current_.scopes[Scope::MC_SLOTS_BUFFER_CLEAR],
                    current_.scopes[Scope::MC_SWEEP],
                    current_.scopes[Scope::MC_SWEEP_NEWSPACE],
                    current_.scopes[Scope::MC_SWEEP_OLDSPACE],
                    current_.scopes[Scope::MC_SWEEP_CODE],
                    current_.scopes[Scope::MC_SWEEP_CELL],
                    current_.scopes[Scope::MC_SWEEP_MAP],
                    current_.scopes[Scope::MC_SWEEP_ABORTED],
                    current_.scopes[Scope::MC_EVACUATE_PAGES],
@@ skipping 306 matching lines @@
 
 
 bool GCTracer::SurvivalEventsRecorded() const {
   return survival_events_.size() > 0;
 }
 
 
 void GCTracer::ResetSurvivalEvents() { survival_events_.reset(); }
 }  // namespace internal
 }  // namespace v8