mirror of
https://github.com/RPCS3/llvm.git
synced 2026-07-22 11:45:31 -04:00
[NewPM][TSan] Reiterate the TSan port
Summary: Second iteration of D56433 which got reverted in rL350719. The problem in the previous version was that we dropped the thunk calling the tsan init function. The new version keeps the thunk which should appease dyld, but is not actually OK wrt. the current semantics of function passes. Hence, add a helper to insert the functions only on the first time. The helper allows hooking into the insertion to be able to append them to the global ctors list. Reviewers: chandlerc, vitalybuka, fedor.sergeev, leonardchan Subscribers: hiraditya, bollu, llvm-commits Differential Revision: https://reviews.llvm.org/D56538 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@351314 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@@ -174,6 +174,28 @@ std::pair<Function *, Function *> llvm::createSanitizerCtorAndInitFunctions(
|
||||
return std::make_pair(Ctor, InitFunction);
|
||||
}
|
||||
|
||||
std::pair<Function *, Function *>
|
||||
llvm::getOrCreateSanitizerCtorAndInitFunctions(
|
||||
Module &M, StringRef CtorName, StringRef InitName,
|
||||
ArrayRef<Type *> InitArgTypes, ArrayRef<Value *> InitArgs,
|
||||
function_ref<void(Function *, Function *)> FunctionsCreatedCallback,
|
||||
StringRef VersionCheckName) {
|
||||
assert(!CtorName.empty() && "Expected ctor function name");
|
||||
|
||||
if (Function *Ctor = M.getFunction(CtorName))
|
||||
// FIXME: Sink this logic into the module, similar to the handling of
|
||||
// globals. This will make moving to a concurrent model much easier.
|
||||
if (Ctor->arg_size() == 0 ||
|
||||
Ctor->getReturnType() == Type::getVoidTy(M.getContext()))
|
||||
return {Ctor, declareSanitizerInitFunction(M, InitName, InitArgTypes)};
|
||||
|
||||
Function *Ctor, *InitFunction;
|
||||
std::tie(Ctor, InitFunction) = llvm::createSanitizerCtorAndInitFunctions(
|
||||
M, CtorName, InitName, InitArgTypes, InitArgs, VersionCheckName);
|
||||
FunctionsCreatedCallback(Ctor, InitFunction);
|
||||
return std::make_pair(Ctor, InitFunction);
|
||||
}
|
||||
|
||||
Function *llvm::getOrCreateInitFunction(Module &M, StringRef Name) {
|
||||
assert(!Name.empty() && "Expected init function name");
|
||||
if (Function *F = M.getFunction(Name)) {
|
||||
|
||||
Reference in New Issue
Block a user