Revert 166547 - Use tcmalloc's debugallocation for Debug builds

base/allocator/allocator.gyp

 # 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.
 
 {
   'variables': {
     'jemalloc_dir': '../../third_party/jemalloc/chromium',
     'tcmalloc_dir': '../../third_party/tcmalloc/chromium',
     'use_vtable_verify%': 0,
   },
@@ skipping 185 matching lines @@
 
         # jemalloc files
         '<(jemalloc_dir)/jemalloc.c',
         '<(jemalloc_dir)/jemalloc.h',
         '<(jemalloc_dir)/ql.h',
         '<(jemalloc_dir)/qr.h',
         '<(jemalloc_dir)/rb.h',
 
         'allocator_shim.cc',
         'allocator_shim.h',
-        'debugallocation_shim.cc',
         'generic_allocators.cc',
         'win_allocator.cc',
       ],
       # sources! means that these are not compiled directly.
       'sources!': [
         # Included by allocator_shim.cc for maximal inlining.
         'generic_allocators.cc',
         'win_allocator.cc',
 
-        # Included by debugallocation_shim.cc.
-        '<(tcmalloc_dir)/src/debugallocation.cc',
-        '<(tcmalloc_dir)/src/tcmalloc.cc',
-
         # We simply don't use these, but list them above so that IDE
         # users can view the full available source for reference, etc.
         '<(tcmalloc_dir)/src/addressmap-inl.h',
         '<(tcmalloc_dir)/src/base/atomicops-internals-linuxppc.h',
         '<(tcmalloc_dir)/src/base/atomicops-internals-macosx.h',
         '<(tcmalloc_dir)/src/base/atomicops-internals-x86-msvc.h',
         '<(tcmalloc_dir)/src/base/atomicops-internals-x86.cc',
         '<(tcmalloc_dir)/src/base/atomicops-internals-x86.h',
         '<(tcmalloc_dir)/src/base/atomicops.h',
         '<(tcmalloc_dir)/src/base/basictypes.h',
@@ skipping 68 matching lines @@
           'AdditionalOptions': ['/ignore:4006'],
         },
       },
       'configurations': {
         'Debug_Base': {
           'msvs_settings': {
             'VCCLCompilerTool': {
               'RuntimeLibrary': '0',
             },
           },
-          'variables': {
-            # Provide a way to force disable debugallocation in Debug builds,
-            # e.g. for profiling (it's more rare to profile Debug builds,
-            # but people sometimes need to do that).
-            'disable_debugallocation%': 0,
-          },
-          'conditions': [
-            ['disable_debugallocation==0', {
-              'defines': [
-                # Use debugallocation for Debug builds to catch problems early
-                # and cleanly, http://crbug.com/30715 .
-                'TCMALLOC_FOR_DEBUGALLOCATION',
-              ],
-            }],
-          ],
         },
       },
       'conditions': [
         ['OS=="linux" and clang_type_profiler==1', {
           'dependencies': [
             'type_profiler_tcmalloc',
           ],
           # It is undoing dependencies and cflags_cc for type_profiler which
           # build/common.gypi injects into all targets.
           'dependencies!': [
@@ skipping 26 matching lines @@
             '<(tcmalloc_dir)/src/base/linuxthreads.h',
             '<(tcmalloc_dir)/src/base/vdso_support.cc',
             '<(tcmalloc_dir)/src/base/vdso_support.h',
             '<(tcmalloc_dir)/src/maybe_threads.cc',
             '<(tcmalloc_dir)/src/maybe_threads.h',
             '<(tcmalloc_dir)/src/symbolize.h',
             '<(tcmalloc_dir)/src/system-alloc.cc',
             '<(tcmalloc_dir)/src/system-alloc.h',
 
             # included by allocator_shim.cc
-            'debugallocation_shim.cc',
+            '<(tcmalloc_dir)/src/tcmalloc.cc',
 
             # heap-profiler/checker/cpuprofiler
             '<(tcmalloc_dir)/src/base/thread_lister.c',
             '<(tcmalloc_dir)/src/base/thread_lister.h',
             '<(tcmalloc_dir)/src/deep-heap-profile.cc',
             '<(tcmalloc_dir)/src/deep-heap-profile.h',
             '<(tcmalloc_dir)/src/heap-checker-bcad.cc',
             '<(tcmalloc_dir)/src/heap-checker.cc',
             '<(tcmalloc_dir)/src/heap-profiler.cc',
             '<(tcmalloc_dir)/src/heap-profile-table.cc',
             '<(tcmalloc_dir)/src/heap-profile-table.h',
             '<(tcmalloc_dir)/src/memory_region_map.cc',
             '<(tcmalloc_dir)/src/memory_region_map.h',
             '<(tcmalloc_dir)/src/profiledata.cc',
             '<(tcmalloc_dir)/src/profiledata.h',
             '<(tcmalloc_dir)/src/profile-handler.cc',
             '<(tcmalloc_dir)/src/profile-handler.h',
             '<(tcmalloc_dir)/src/profiler.cc',
+
+            # debugallocation
+            '<(tcmalloc_dir)/src/debugallocation.cc',
           ],
         }],
         ['OS=="linux" or OS=="freebsd" or OS=="solaris"', {
           'sources!': [
             '<(tcmalloc_dir)/src/system-alloc.h',
             '<(tcmalloc_dir)/src/windows/port.cc',
             '<(tcmalloc_dir)/src/windows/port.h',
 
             # TODO(willchan): Support allocator shim later on.
             'allocator_shim.cc',
@@ skipping 26 matching lines @@
               '-Wl,-u_Z21InitialMallocHook_NewPKvj,-u_Z22InitialMallocHook_MMapPKvS0_jiiix,-u_Z22InitialMallocHook_SbrkPKvi',
               '-Wl,-u_Z21InitialMallocHook_NewPKvm,-u_Z22InitialMallocHook_MMapPKvS0_miiil,-u_Z22InitialMallocHook_SbrkPKvl',
               '-Wl,-u_ZN15HeapLeakChecker12IgnoreObjectEPKv,-u_ZN15HeapLeakChecker14UnIgnoreObjectEPKv',
           ]},
         }],
         [ 'use_vtable_verify==1', {
           'cflags': [
             '-fvtable-verify=preinit',
           ],
         }],
+        [ 'linux_use_debugallocation==1', {
+          'sources!': [
+            # debugallocation.cc #includes tcmalloc.cc,
+            # so only one of them should be used.
+            '<(tcmalloc_dir)/src/tcmalloc.cc',
+          ],
+          'defines': [
+            'TCMALLOC_FOR_DEBUGALLOCATION',
+          ],
+        }, { # linux_use_debugallocation != 1
+          'sources!': [
+            '<(tcmalloc_dir)/src/debugallocation.cc',
+          ],
+        }],
         [ 'linux_keep_shadow_stacks==1', {
           'sources': [
             '<(tcmalloc_dir)/src/linux_shadow_stacks.cc',
             '<(tcmalloc_dir)/src/linux_shadow_stacks.h',
             '<(tcmalloc_dir)/src/stacktrace_shadow-inl.h',
           ],
           'cflags': [
             '-finstrument-functions',
           ],
           'defines': [
@@ skipping 215 matching lines @@
           'sources': [
             'type_profiler_map_unittests.cc',
             '<(tcmalloc_dir)/src/gperftools/type_profiler_map.h',
             '<(tcmalloc_dir)/src/type_profiler_map.cc',
           ],
         },
       ],
     }],
   ],
 }