[PATCH] D61393: [tsan] Fix and re-enable user_malloc.cc test
Vitaly Buka via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Wed May 1 14:53:13 PDT 2019
vitalybuka updated this revision to Diff 197647.
vitalybuka marked an inline comment as done.
vitalybuka added a comment.
typo
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D61393/new/
https://reviews.llvm.org/D61393
Files:
compiler-rt/test/tsan/Linux/user_malloc.cc
Index: compiler-rt/test/tsan/Linux/user_malloc.cc
===================================================================
--- compiler-rt/test/tsan/Linux/user_malloc.cc
+++ compiler-rt/test/tsan/Linux/user_malloc.cc
@@ -1,18 +1,14 @@
-// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
-
-// UNSUPPORTED: powerpc64le
-
-// FIXME: Remove the test or find how to fix this.
-// On some distributions, probably with newer glibc, tsan initialization calls
-// dlsym which then calls malloc and crashes because of tsan is not initialized.
-// UNSUPPORTED: linux
+// RUN: %clangxx_tsan -c -O1 -fno-sanitize=thread %s -o %t.o
+// RUN: %clangxx_tsan -O1 %s %t.o -o %t && %run %t 2>&1 | FileCheck %s
#include <stdio.h>
+#include <stdlib.h>
+
+#if !__has_feature(thread_sanitizer)
// Defined by tsan.
extern "C" void *__interceptor_malloc(unsigned long size);
extern "C" void __interceptor_free(void *p);
-
extern "C" void *malloc(unsigned long size) {
static int first = 0;
if (__sync_lock_test_and_set(&first, 1) == 0)
@@ -24,12 +20,16 @@
__interceptor_free(p);
}
+#else
+
int main() {
volatile char *p = (char*)malloc(10);
p[0] = 0;
free((void*)p);
}
+#endif
+
// CHECK: user malloc
// CHECK-NOT: ThreadSanitizer
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D61393.197647.patch
Type: text/x-patch
Size: 1254 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190501/b5c840e2/attachment.bin>
More information about the llvm-commits
mailing list