6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-10-31 08:16:47 +00:00
Code Issues Projects Releases Wiki Activity

TSan: Use createSanitizerCtor to create ctor, and call __tsan_init

Browse Source 
Reviewers: kcc, dvyukov

Subscribers: llvm-commits

Differential Revision: http://reviews.llvm.org/D8779

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@236778 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Ismail Pazarbasi
2015-05-07 21:41:23 +00:00
parent 914ef58002
commit 2bdae13eff
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/Transforms/Instrumentation/ThreadSanitizer.cpp
View File

@@ -72,6 +72,9 @@ STATISTIC(NumOmittedReadsFromConstantGlobals,
STATISTIC(NumOmittedReadsFromVtable, "Number of vtable reads"); STATISTIC(NumOmittedReadsFromVtable, "Number of vtable reads");
STATISTIC(NumOmittedNonCaptured, "Number of accesses ignored due to capturing"); STATISTIC(NumOmittedNonCaptured, "Number of accesses ignored due to capturing");
static const char *const kTsanModuleCtorName = "tsan.module_ctor";
static const char *const kTsanInitName = "__tsan_init";
namespace { namespace {
/// ThreadSanitizer: instrument the code in module to find races. /// ThreadSanitizer: instrument the code in module to find races.
@@ -113,6 +116,7 @@ struct ThreadSanitizer : public FunctionPass {
Function *TsanVptrUpdate; Function *TsanVptrUpdate;
Function *TsanVptrLoad; Function *TsanVptrLoad;
Function *MemmoveFn, *MemcpyFn, *MemsetFn; Function *MemmoveFn, *MemcpyFn, *MemsetFn;
Function *TsanCtorFunction;
}; };
} // namespace } // namespace
@@ -225,13 +229,12 @@ void ThreadSanitizer::initializeCallbacks(Module &M) {
bool ThreadSanitizer::doInitialization(Module &M) { bool ThreadSanitizer::doInitialization(Module &M) {
const DataLayout &DL = M.getDataLayout(); const DataLayout &DL = M.getDataLayout();
IntptrTy = DL.getIntPtrType(M.getContext());
std::tie(TsanCtorFunction, std::ignore) = createSanitizerCtorAndInitFunctions(
M, kTsanModuleCtorName, kTsanInitName, /*InitArgTypes=*/{},
/*InitArgs=*/{});
// Always insert a call to __tsan_init into the module's CTORs. appendToGlobalCtors(M, TsanCtorFunction, 0);
IRBuilder<> IRB(M.getContext());
IntptrTy = IRB.getIntPtrTy(DL);
Value *TsanInit = M.getOrInsertFunction("__tsan_init",
IRB.getVoidTy(), nullptr);
appendToGlobalCtors(M, cast<Function>(TsanInit), 0);
return true; return true;
} }
@@ -329,6 +332,10 @@ static bool isAtomic(Instruction *I) {
} }
bool ThreadSanitizer::runOnFunction(Function &F) { bool ThreadSanitizer::runOnFunction(Function &F) {
// This is required to prevent instrumenting call to __tsan_init from within
// the module constructor.
if (&F == TsanCtorFunction)
return false;
initializeCallbacks(*F.getParent()); initializeCallbacks(*F.getParent());
SmallVector<Instruction*, 8> RetVec; SmallVector<Instruction*, 8> RetVec;
SmallVector<Instruction*, 8> AllLoadsAndStores; SmallVector<Instruction*, 8> AllLoadsAndStores;

5
test/Instrumentation/ThreadSanitizer/tsan_basic.ll
View File

@@ -9,7 +9,7 @@ entry:
ret i32 %tmp1 ret i32 %tmp1
} }
; CHECK: @llvm.global_ctors = {{.*}}@__tsan_init ; CHECK: @llvm.global_ctors = {{.*}}@tsan.module_ctor
; CHECK: define i32 @read_4_bytes(i32* %a) ; CHECK: define i32 @read_4_bytes(i32* %a)
; CHECK: call void @__tsan_func_entry(i8* %0) ; CHECK: call void @__tsan_func_entry(i8* %0)
@@ -53,3 +53,6 @@ entry:
; CHECK: call i8* @memset ; CHECK: call i8* @memset
; CHECK: ret void ; CHECK: ret void
} }
; CHECK: define internal void @tsan.module_ctor()
; CHECK: call void @__tsan_init()