[compiler-rt] r317061 - Revert "[fuzzer] Fix threaded stack printing and nested mallocs"
Vitaly Buka via llvm-commits
llvm-commits at lists.llvm.org
Tue Oct 31 17:55:52 PDT 2017
Author: vitalybuka
Date: Tue Oct 31 17:55:52 2017
New Revision: 317061
URL: http://llvm.org/viewvc/llvm-project?rev=317061&view=rev
Log:
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.
Removed:
compiler-rt/trunk/lib/fuzzer/scripts/
compiler-rt/trunk/test/fuzzer/TraceMallocThreadedTest.cpp
compiler-rt/trunk/test/fuzzer/trace-malloc-threaded.test
compiler-rt/trunk/test/fuzzer/trace-malloc-unbalanced.test
Modified:
compiler-rt/trunk/lib/fuzzer/FuzzerLoop.cpp
Modified: compiler-rt/trunk/lib/fuzzer/FuzzerLoop.cpp
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/fuzzer/FuzzerLoop.cpp?rev=317061&r1=317060&r2=317061&view=diff
==============================================================================
--- compiler-rt/trunk/lib/fuzzer/FuzzerLoop.cpp (original)
+++ compiler-rt/trunk/lib/fuzzer/FuzzerLoop.cpp Tue Oct 31 17:55:52 2017
@@ -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
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();
Removed: compiler-rt/trunk/test/fuzzer/TraceMallocThreadedTest.cpp
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/fuzzer/TraceMallocThreadedTest.cpp?rev=317060&view=auto
==============================================================================
--- compiler-rt/trunk/test/fuzzer/TraceMallocThreadedTest.cpp (original)
+++ compiler-rt/trunk/test/fuzzer/TraceMallocThreadedTest.cpp (removed)
@@ -1,22 +0,0 @@
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-
-// Check that allocation tracing from different threads does not cause
-// interleaving of stack traces.
-#include <assert.h>
-#include <cstddef>
-#include <cstdint>
-#include <cstring>
-#include <thread>
-
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
- auto C = [&] {
- volatile void *a = malloc(5639);
- free((void *)a);
- };
- std::thread T[] = {std::thread(C), std::thread(C), std::thread(C),
- std::thread(C), std::thread(C), std::thread(C)};
- for (auto &X : T)
- X.join();
- return 0;
-}
Removed: compiler-rt/trunk/test/fuzzer/trace-malloc-threaded.test
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/fuzzer/trace-malloc-threaded.test?rev=317060&view=auto
==============================================================================
--- compiler-rt/trunk/test/fuzzer/trace-malloc-threaded.test (original)
+++ compiler-rt/trunk/test/fuzzer/trace-malloc-threaded.test (removed)
@@ -1,36 +0,0 @@
-// FIXME: This test infinite loops on darwin because it crashes
-// printing a stack trace repeatedly
-UNSUPPORTED: darwin
-
-RUN: %cpp_compiler %S/TraceMallocThreadedTest.cpp -o %t-TraceMallocThreadedTest
-
-RUN: %t-TraceMallocThreadedTest -trace_malloc=2 -runs=1 2>&1 | FileCheck %s
-CHECK: {{MALLOC\[[0-9]+] +0x[0-9]+ 5639}}
-CHECK-NEXT: {{ +\#0 +}}
-CHECK-NEXT: {{ +\#1 +}}
-CHECK-NEXT: {{ +\#2 +}}
-
-CHECK: {{MALLOC\[[0-9]+] +0x[0-9]+ 5639}}
-CHECK-NEXT: {{ +\#0 +}}
-CHECK-NEXT: {{ +\#1 +}}
-CHECK-NEXT: {{ +\#2 +}}
-
-CHECK: {{MALLOC\[[0-9]+] +0x[0-9]+ 5639}}
-CHECK-NEXT: {{ +\#0 +}}
-CHECK-NEXT: {{ +\#1 +}}
-CHECK-NEXT: {{ +\#2 +}}
-
-CHECK: {{MALLOC\[[0-9]+] +0x[0-9]+ 5639}}
-CHECK-NEXT: {{ +\#0 +}}
-CHECK-NEXT: {{ +\#1 +}}
-CHECK-NEXT: {{ +\#2 +}}
-
-CHECK: {{MALLOC\[[0-9]+] +0x[0-9]+ 5639}}
-CHECK-NEXT: {{ +\#0 +}}
-CHECK-NEXT: {{ +\#1 +}}
-CHECK-NEXT: {{ +\#2 +}}
-
-CHECK: {{MALLOC\[[0-9]+] +0x[0-9]+ 5639}}
-CHECK-NEXT: {{ +\#0 +}}
-CHECK-NEXT: {{ +\#1 +}}
-CHECK-NEXT: {{ +\#2 +}}
Removed: compiler-rt/trunk/test/fuzzer/trace-malloc-unbalanced.test
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/fuzzer/trace-malloc-unbalanced.test?rev=317060&view=auto
==============================================================================
--- compiler-rt/trunk/test/fuzzer/trace-malloc-unbalanced.test (original)
+++ compiler-rt/trunk/test/fuzzer/trace-malloc-unbalanced.test (removed)
@@ -1,27 +0,0 @@
-// FIXME: This test infinite loops on darwin because it crashes
-// printing a stack trace repeatedly
-UNSUPPORTED: darwin
-
-// Verifies lib/fuzzer/scripts/unbalanced_allocs.py script
-
-RUN: %cpp_compiler %S/TraceMallocTest.cpp -o %t-TraceMallocTest
-
-RUN: %t-TraceMallocTest -seed=1 -trace_malloc=1 -runs=100 2>&1 | \
-RUN: %libfuzzer_src/scripts/unbalanced_allocs.py --skip=5 | FileCheck %s
-
-RUN: %t-TraceMallocTest -seed=1 -trace_malloc=2 -runs=100 2>&1 | \
-RUN: %libfuzzer_src/scripts/unbalanced_allocs.py --skip=5 | FileCheck %s --check-prefixes=CHECK,CHECK2
-
-CHECK: MallocFreeTracer: START
-CHECK: Unbalanced MALLOC[{{[0-9]+}}] [[PTR:0x[0-9a-f]+]] 4
-CHECK2-NEXT: {{ #0 0x[0-9a-f]+ in }}
-CHECK2-NEXT: {{ #1 0x[0-9a-f]+ in }}
-CHECK2-NEXT: {{ #2 0x[0-9a-f]+ in }}
-CHECK: MallocFreeTracer: STOP
-
-CHECK: MallocFreeTracer: START
-CHECK: Unbalanced FREE[{{[0-9]+}}] [[PTR]]
-CHECK2-NEXT: {{ #0 0x[0-9a-f]+ in }}
-CHECK2-NEXT: {{ #1 0x[0-9a-f]+ in }}
-CHECK2-NEXT: {{ #2 0x[0-9a-f]+ in }}
-CHECK: MallocFreeTracer: STOP
More information about the llvm-commits
mailing list