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

[tsan] fix instrumentation of vector vptr updates (https://code.google.com/p/thread-sanitizer/issues/detail?id=43) 

llvm-svn: 196079
This commit is contained in:
Kostya Serebryany 2013-12-02 08:07:15 +00:00
parent 0156afb0ed
commit 08b9cf56be
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
llvm/lib/Transforms/Instrumentation/ThreadSanitizer.cpp
View File

@ -402,13 +402,16 @@ bool ThreadSanitizer::instrumentLoadOrStore(Instruction *I) {
if (IsWrite && isVtableAccess(I)) { if (IsWrite && isVtableAccess(I)) {
DEBUG(dbgs() << " VPTR : " << *I << "\n"); DEBUG(dbgs() << " VPTR : " << *I << "\n");
Value *StoredValue = cast<StoreInst>(I)->getValueOperand(); Value *StoredValue = cast<StoreInst>(I)->getValueOperand();
// StoredValue does not necessary have a pointer type. // StoredValue may be a vector type if we are storing several vptrs at once.
if (isa<IntegerType>(StoredValue->getType())) // In this case, just take the first element of the vector since this is
StoredValue = IRB.CreateIntToPtr(StoredValue, IRB.getInt8PtrTy()); // enough to find vptr races.
if (isa<VectorType>(StoredValue->getType()))
StoredValue = IRB.CreateExtractElement(
StoredValue, ConstantInt::get(IRB.getInt32Ty(), 0));
// Call TsanVptrUpdate. // Call TsanVptrUpdate.
IRB.CreateCall2(TsanVptrUpdate, IRB.CreateCall2(TsanVptrUpdate,
IRB.CreatePointerCast(Addr, IRB.getInt8PtrTy()), IRB.CreatePointerCast(Addr, IRB.getInt8PtrTy()),
IRB.CreatePointerCast(StoredValue, IRB.getInt8PtrTy())); IRB.CreateBitCast(StoredValue, IRB.getInt8PtrTy()));
NumInstrumentedVtableWrites++; NumInstrumentedVtableWrites++;
return true; return true;
} }

17
llvm/test/Instrumentation/ThreadSanitizer/vptr_update.ll
View File

@ -4,10 +4,27 @@ target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f3
define void @Foo(i8** nocapture %a, i8* %b) nounwind uwtable sanitize_thread { define void @Foo(i8** nocapture %a, i8* %b) nounwind uwtable sanitize_thread {
entry: entry:
; CHECK-LABEL: @Foo
; CHECK: call void @__tsan_vptr_update ; CHECK: call void @__tsan_vptr_update
; CHECK: ret void
store i8* %b, i8** %a, align 8, !tbaa !0 store i8* %b, i8** %a, align 8, !tbaa !0
ret void ret void
} }
declare i32 @Func1()
declare i32 @Func2()
; Test that we properly handle vector stores marked as vtable updates.
define void @VectorVptrUpdate(<2 x i8*>* nocapture %a, i8* %b) nounwind uwtable sanitize_thread {
entry:
; CHECK-LABEL: @VectorVptrUpdate
; CHECK: call void @__tsan_vptr_update{{.*}}Func1
; CHECK-NOT: call void @__tsan_vptr_update
; CHECK: ret void
store <2 x i8 *> <i8* bitcast(i32 ()* @Func1 to i8 *), i8* bitcast(i32 ()* @Func2 to i8 *)>, <2 x i8 *>* %a, align 8, !tbaa !0
ret void
}
!0 = metadata !{metadata !2, metadata !2, i64 0} !0 = metadata !{metadata !2, metadata !2, i64 0}
!1 = metadata !{metadata !"Simple C/C++ TBAA", null} !1 = metadata !{metadata !"Simple C/C++ TBAA", null}
!2 = metadata !{metadata !"vtable pointer", metadata !1} !2 = metadata !{metadata !"vtable pointer", metadata !1}