wangtao
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tsan: better reporting for virtual-call-after-free 

Previously we said that it's a data race, which is confusing
if it happens in the same thread.

llvm-svn: 219600
This commit is contained in:
Dmitry Vyukov 2014-10-13 08:46:25 +00:00
parent b205978100
commit 02ff8bb986
5 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler-rt/lib/tsan/rtl/tsan_report.cc
View File

@ -70,6 +70,8 @@ static const char *ReportTypeString(ReportType typ) {
return "data race on vptr (ctor/dtor vs virtual call)";
if (typ == ReportTypeUseAfterFree)
return "heap-use-after-free";
if (typ == ReportTypeVptrUseAfterFree)
return "heap-use-after-free (virtual call vs free)";
if (typ == ReportTypeThreadLeak)
return "thread leak";
if (typ == ReportTypeMutexDestroyLocked)

1
compiler-rt/lib/tsan/rtl/tsan_report.h
View File

@ -22,6 +22,7 @@ enum ReportType {
ReportTypeRace,
ReportTypeVptrRace,
ReportTypeUseAfterFree,
ReportTypeVptrUseAfterFree,
ReportTypeThreadLeak,
ReportTypeMutexDestroyLocked,
ReportTypeMutexDoubleLock,

4
compiler-rt/lib/tsan/rtl/tsan_rtl_report.cc
View File

@ -627,7 +627,9 @@ void ReportRace(ThreadState *thr) {
ThreadRegistryLock l0(ctx->thread_registry);
ReportType typ = ReportTypeRace;
if (thr->is_vptr_access)
if (thr->is_vptr_access && freed)
typ = ReportTypeVptrUseAfterFree;
else if (thr->is_vptr_access)
typ = ReportTypeVptrRace;
else if (freed)
typ = ReportTypeUseAfterFree;

2
compiler-rt/lib/tsan/rtl/tsan_suppressions.cc
View File

@ -60,6 +60,8 @@ SuppressionType conv(ReportType typ) {
return SuppressionRace;
else if (typ == ReportTypeUseAfterFree)
return SuppressionRace;
else if (typ == ReportTypeVptrUseAfterFree)
return SuppressionRace;
else if (typ == ReportTypeThreadLeak)
return SuppressionThread;
else if (typ == ReportTypeMutexDestroyLocked)

34
compiler-rt/test/tsan/vptr_harmful_race4.cc Normal file
View File

@ -0,0 +1,34 @@
// RUN: %clangxx_tsan -O1 %s -o %t && %deflake %run %t | FileCheck %s
#include <pthread.h>
#include <stdio.h>
#include <unistd.h>
struct A {
virtual void F() {
}
virtual ~A() {
}
};
struct B : A {
virtual void F() {
}
};
void *Thread(void *x) {
sleep(1);
((A*)x)->F();
return 0;
}
int main() {
A *obj = new B;
pthread_t t;
pthread_create(&t, 0, Thread, obj);
delete obj;
pthread_join(t, 0);
}
// CHECK: WARNING: ThreadSanitizer: heap-use-after-free (virtual call vs free)