[compiler-rt] r191522 - [LSan] Don't report leaks with single-frame stack traces

[Alexey Samsonov]

Author: samsonov
Date: Fri Sep 27 08:54:20 2013
New Revision: 191522

URL: http://llvm.org/viewvc/llvm-project?rev=191522&view=rev
Log:
[LSan] Don't report leaks with single-frame stack traces

Added:
    compiler-rt/trunk/lib/lsan/lit_tests/TestCases/swapcontext.cc
Modified:
    compiler-rt/trunk/lib/lsan/lsan_common.cc

Added: compiler-rt/trunk/lib/lsan/lit_tests/TestCases/swapcontext.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/lsan/lit_tests/TestCases/swapcontext.cc?rev=191522&view=auto
==============================================================================
--- compiler-rt/trunk/lib/lsan/lit_tests/TestCases/swapcontext.cc (added)
+++ compiler-rt/trunk/lib/lsan/lit_tests/TestCases/swapcontext.cc Fri Sep 27 08:54:20 2013
@@ -0,0 +1,42 @@
+// We can't unwind stack if we're running coroutines on heap-allocated
+// memory. Make sure we don't report these leaks.
+
+// RUN: %clangxx_lsan %s -o %t
+// RUN: %t 2>&1
+// RUN: not %t foo 2>&1 | FileCheck %s
+
+#include <stdio.h>
+#include <ucontext.h>
+#include <unistd.h>
+
+const int kStackSize = 1 << 20;
+
+void Child() {
+  int child_stack;
+  printf("Child: %p\n", &child_stack);
+  int *leaked = new int[666];
+}
+
+int main(int argc, char *argv[]) {
+  char stack_memory[kStackSize + 1];
+  char *heap_memory = new char[kStackSize + 1];
+  char *child_stack = (argc > 1) ? stack_memory : heap_memory;
+
+  printf("Child stack: %p\n", child_stack);
+  ucontext_t orig_context;
+  ucontext_t child_context;
+  getcontext(&child_context);
+  child_context.uc_stack.ss_sp = child_stack;
+  child_context.uc_stack.ss_size = kStackSize / 2;
+  child_context.uc_link = &orig_context;
+  makecontext(&child_context, Child, 0);
+  if (swapcontext(&orig_context, &child_context) < 0) {
+    perror("swapcontext");
+    return 1;
+  }
+
+  delete[] heap_memory;
+  return 0;
+}
+
+// CHECK: SUMMARY: LeakSanitizer: 2664 byte(s) leaked in 1 allocation(s)

Modified: compiler-rt/trunk/lib/lsan/lsan_common.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/lsan/lsan_common.cc?rev=191522&r1=191521&r2=191522&view=diff
==============================================================================
--- compiler-rt/trunk/lib/lsan/lsan_common.cc (original)
+++ compiler-rt/trunk/lib/lsan/lsan_common.cc Fri Sep 27 08:54:20 2013
@@ -295,10 +295,14 @@ static void CollectLeaksCb(uptr chunk, v
   LsanMetadata m(chunk);
   if (!m.allocated()) return;
   if (m.tag() == kDirectlyLeaked || m.tag() == kIndirectlyLeaked) {
+    uptr size = 0;
+    const uptr *trace = StackDepotGet(m.stack_trace_id(), &size);
+    // Ignore leaks with one-frame stack traces (which often come from
+    // coroutines) - they are not actionable.
+    if (size <= 1)
+      return;
     uptr resolution = flags()->resolution;
     if (resolution > 0) {
-      uptr size = 0;
-      const uptr *trace = StackDepotGet(m.stack_trace_id(), &size);
       size = Min(size, resolution);
       leak_report->Add(StackDepotPut(trace, size), m.requested_size(), m.tag());
     } else {