Revert 190835 - Fix MMAP_LIST in dumps by deep-heap-profile.

third_party/tcmalloc/chromium/src/deep-heap-profile.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // ---
 // Author: Sainbayar Sukhbaatar
 //         Dai Mikurube
 //
 
 #include "deep-heap-profile.h"
@@ skipping 646 matching lines @@
         memory_residence_info_getter, first_address, last_address);
 
     // TODO(dmikurube): Stop double-counting pagemap.
     // Counts unhooked memory regions in /proc/<pid>/maps.
     if (MemoryRegionMap::IsRecordingLocked()) {
       // It assumes that every mmap'ed region is included in one maps line.
       uint64 cursor = first_address;
       bool first = true;
 
       do {
+        Bucket* bucket = NULL;
+        DeepBucket* deep_bucket = NULL;
         if (!first) {
-          cursor = mmap_iter->end_addr;
-          ++mmap_iter;
-          // Don't break here even if mmap_iter == EndRegionLocked().
-        }
-        first = false;
-
-        DeepBucket* deep_bucket = NULL;
-        if (mmap_iter != MemoryRegionMap::EndRegionLocked()) {
           size_t committed = deep_profile->memory_residence_info_getter_->
               CommittedSize(mmap_iter->start_addr, mmap_iter->end_addr - 1);
           // TODO(dmikurube): Store a reference to the bucket in region.
           Bucket* bucket = MemoryRegionMap::GetBucket(
               mmap_iter->call_stack_depth, mmap_iter->call_stack);
+          DeepBucket* deep_bucket = NULL;
           if (bucket != NULL) {
             deep_bucket = deep_profile->deep_table_.Lookup(
                 bucket,
 #if defined(TYPE_PROFILING)
                 NULL,  // No type information for mmap'ed memory regions.
 #endif
                 /* is_mmap */ true);
           }
 
           if (deep_bucket != NULL)
             deep_bucket->committed_size += committed;
           profiled_mmap_.AddToVirtualBytes(
               mmap_iter->end_addr - mmap_iter->start_addr);
           profiled_mmap_.AddToCommittedBytes(committed);
+
+          cursor = mmap_iter->end_addr;
+          ++mmap_iter;
+          // Don't break here even if mmap_iter == EndRegionLocked().
         }
+        first = false;
 
         uint64 last_address_of_unhooked;
         // If the next mmap entry is away from the current maps line.
         if (mmap_iter == MemoryRegionMap::EndRegionLocked() ||
             mmap_iter->start_addr > last_address) {
           last_address_of_unhooked = last_address;
         } else {
           last_address_of_unhooked = mmap_iter->start_addr - 1;
         }
 
@@ skipping 178 matching lines @@
 }
 
 DeepHeapProfile::~DeepHeapProfile() {
 }
 
 int DeepHeapProfile::FillOrderedProfile(char raw_buffer[], int buffer_size) {
   return heap_profile_->FillOrderedProfile(raw_buffer, buffer_size);
 }
 
 #endif  // DEEP_HEAP_PROFILE