Revert "[fuzzer] Fix threaded stack printing and nested mallocs"

Fails on darwin

Revert "[fuzzer] Script to detect unbalanced allocation in -trace_malloc output"
Needs previous one.

This reverts commit r317034, r317036.

git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@317061 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 0 insertions, 19 deletions

diff --git a/lib/fuzzer/FuzzerLoop.cpp b/lib/fuzzer/FuzzerLoop.cpp
index 9cb580a30..d3ac4ce7e 100644
--- a/lib/fuzzer/FuzzerLoop.cpp
+++ b/lib/fuzzer/FuzzerLoop.cpp
@@ -19,7 +19,6 @@
 #include <algorithm>
 #include <cstring>
 #include <memory>
-#include <mutex>
 #include <set>
 
 #if defined(__has_include)
@@ -74,24 +73,11 @@ struct MallocFreeTracer {
 
 static MallocFreeTracer AllocTracer;
 
-static thread_local bool IsMallocFreeHookDisabled;
-static std::mutex MallocFreeStackMutex;
-
-struct MallocFreeHookDisabler {
-  MallocFreeHookDisabler() { IsMallocFreeHookDisabled = true; }
-  ~MallocFreeHookDisabler() { IsMallocFreeHookDisabled = false; }
-};
-
 ATTRIBUTE_NO_SANITIZE_MEMORY
 void MallocHook(const volatile void *ptr, size_t size) {
-  // Avoid nested hooks for mallocs/frees in sanitizer.
-  if (IsMallocFreeHookDisabled)
-    return;
-  MallocFreeHookDisabler Disable;
   size_t N = AllocTracer.Mallocs++;
   F->HandleMalloc(size);
   if (int TraceLevel = AllocTracer.TraceLevel) {
-    std::lock_guard<std::mutex> Lock(MallocFreeStackMutex);
     Printf("MALLOC[%zd] %p %zd\n", N, ptr, size);
     if (TraceLevel >= 2 && EF)
       EF->__sanitizer_print_stack_trace();
@@ -100,13 +86,8 @@ void MallocHook(const volatile void *ptr, size_t size) {
 
 ATTRIBUTE_NO_SANITIZE_MEMORY
 void FreeHook(const volatile void *ptr) {
-  // Avoid nested hooks for mallocs/frees in sanitizer.
-  if (IsMallocFreeHookDisabled)
-    return;
-  MallocFreeHookDisabler Disable;
   size_t N = AllocTracer.Frees++;
   if (int TraceLevel = AllocTracer.TraceLevel) {
-    std::lock_guard<std::mutex> Lock(MallocFreeStackMutex);
     Printf("FREE[%zd]   %p\n", N, ptr);
     if (TraceLevel >= 2 && EF)
       EF->__sanitizer_print_stack_trace();