Merge google-perftools r109 (the current contents of third_party/tcmalloc/vendor)

third_party/tcmalloc/chromium/src/heap-checker-bcad.cc

 // Copyright (c) 2005, Google Inc.
 // All rights reserved.
 // 
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 // 
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
@@ skipping 33 matching lines @@
 // consider that allocation to be a leak, even though it's not (since
 // the allocated object is reachable from global data and hence "live").
 
 #include <stdlib.h>      // for abort()
 #include <google/malloc_extension.h>
 
 // A dummy variable to refer from heap-checker.cc.  This is to make
 // sure this file is not optimized out by the linker.
 bool heap_leak_checker_bcad_variable;
 
-extern void HeapLeakChecker_BeforeConstructors();  // in heap-checker.cc
 extern void HeapLeakChecker_AfterDestructors();  // in heap-checker.cc
 
 // A helper class to ensure that some components of heap leak checking
 // can happen before construction and after destruction
 // of all global/static objects.
 class HeapLeakCheckerGlobalPrePost {
  public:
   HeapLeakCheckerGlobalPrePost() {
     if (count_ == 0) {
-      HeapLeakChecker_BeforeConstructors();
+      // The 'new int' will ensure that we have run an initial malloc
+      // hook, which will set up the heap checker via
+      // MallocHook_InitAtFirstAllocation_HeapLeakChecker.  See malloc_hook.cc.
+      // This is done in this roundabout fashion in order to avoid self-deadlock
+      // if we directly called HeapLeakChecker_BeforeConstructors here.
+      delete new int;
       // This needs to be called before the first allocation of an STL
       // object, but after libc is done setting up threads (because it
       // calls setenv, which requires a thread-aware errno).  By
       // putting it here, we hope it's the first bit of code executed
       // after the libc global-constructor code.
       MallocExtension::Initialize();
     }
     ++count_;
   }
   ~HeapLeakCheckerGlobalPrePost() {
     if (count_ <= 0)  abort();
     --count_;
     if (count_ == 0)  HeapLeakChecker_AfterDestructors();
   }
  private:
   // Counter of constructions/destructions of objects of this class
   // (just in case there are more than one of them).
   static int count_;
 };
 
 int HeapLeakCheckerGlobalPrePost::count_ = 0;
 
 // The early-construction/late-destruction global object.
 static const HeapLeakCheckerGlobalPrePost heap_leak_checker_global_pre_post;