diff options
| -rw-r--r-- | llvm/lib/Transforms/Instrumentation/ThreadSanitizer.cpp | 4 | ||||
| -rw-r--r-- | llvm/test/Instrumentation/ThreadSanitizer/vptr_update.ll | 10 |
2 files changed, 13 insertions, 1 deletions
diff --git a/llvm/lib/Transforms/Instrumentation/ThreadSanitizer.cpp b/llvm/lib/Transforms/Instrumentation/ThreadSanitizer.cpp index baec1534e00..5c188178200 100644 --- a/llvm/lib/Transforms/Instrumentation/ThreadSanitizer.cpp +++ b/llvm/lib/Transforms/Instrumentation/ThreadSanitizer.cpp @@ -408,10 +408,12 @@ bool ThreadSanitizer::instrumentLoadOrStore(Instruction *I) { if (isa<VectorType>(StoredValue->getType())) StoredValue = IRB.CreateExtractElement( StoredValue, ConstantInt::get(IRB.getInt32Ty(), 0)); + if (StoredValue->getType()->isIntegerTy()) + StoredValue = IRB.CreateIntToPtr(StoredValue, IRB.getInt8PtrTy()); // Call TsanVptrUpdate. IRB.CreateCall2(TsanVptrUpdate, IRB.CreatePointerCast(Addr, IRB.getInt8PtrTy()), - IRB.CreateBitCast(StoredValue, IRB.getInt8PtrTy())); + IRB.CreatePointerCast(StoredValue, IRB.getInt8PtrTy())); NumInstrumentedVtableWrites++; return true; } diff --git a/llvm/test/Instrumentation/ThreadSanitizer/vptr_update.ll b/llvm/test/Instrumentation/ThreadSanitizer/vptr_update.ll index 46650040540..83d28b6ee21 100644 --- a/llvm/test/Instrumentation/ThreadSanitizer/vptr_update.ll +++ b/llvm/test/Instrumentation/ThreadSanitizer/vptr_update.ll @@ -11,6 +11,16 @@ entry: ret void } +define void @FooInt(i64* nocapture %a, i64 %b) nounwind uwtable sanitize_thread { +entry: +; CHECK-LABEL: @FooInt +; CHECK: call void @__tsan_vptr_update +; CHECK: ret void + store i64 %b, i64* %a, align 8, !tbaa !0 + ret void +} + + declare i32 @Func1() declare i32 @Func2() |
