6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2026-04-26 12:20:42 +00:00
Code Issues Projects Releases Wiki Activity

[asan] Fix coverage instrumentation with -asan-globals=0.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@210103 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Evgeniy Stepanov
2014-06-03 14:16:00 +00:00
parent 1410a2c906
commit 58a20d70fa
2 changed files with 44 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Transforms/Instrumentation/AddressSanitizer.cpp
+32 -25
View File
@@ -384,6 +384,7 @@ class AddressSanitizerModule : public ModulePass {
private:
void initializeCallbacks(Module &M);
bool InstrumentGlobals(IRBuilder<> &IRB, Module &M);
bool ShouldInstrumentGlobal(GlobalVariable *G);
void poisonOneInitializer(Function &GlobalInit, GlobalValue *ModuleName);
void createInitializerPoisonCalls(Module &M, GlobalValue *ModuleName);
@@ -983,21 +984,7 @@ void AddressSanitizerModule::initializeCallbacks(Module &M) {
// This function replaces all global variables with new variables that have
// trailing redzones. It also creates a function that poisons
// redzones and inserts this function into llvm.global_ctors.
bool AddressSanitizerModule::runOnModule(Module &M) {
if (!ClGlobals) return false;
DataLayoutPass *DLP = getAnalysisIfAvailable<DataLayoutPass>();
if (!DLP)
return false;
DL = &DLP->getDataLayout();
BL.reset(SpecialCaseList::createOrDie(BlacklistFile));
if (BL->isIn(M)) return false;
C = &(M.getContext());
int LongSize = DL->getPointerSizeInBits();
IntptrTy = Type::getIntNTy(*C, LongSize);
Mapping = getShadowMapping(M, LongSize);
initializeCallbacks(M);
bool AddressSanitizerModule::InstrumentGlobals(IRBuilder<> &IRB, Module &M) {
DynamicallyInitializedGlobals.Init(M);
SmallVector<GlobalVariable *, 16> GlobalsToChange;
@@ -1007,16 +994,6 @@ bool AddressSanitizerModule::runOnModule(Module &M) {
GlobalsToChange.push_back(&G);
}
Function *CtorFunc = M.getFunction(kAsanModuleCtorName);
assert(CtorFunc);
IRBuilder<> IRB(CtorFunc->getEntryBlock().getTerminator());
if (ClCoverage > 0) {
Function *CovFunc = M.getFunction(kAsanCovName);
int nCov = CovFunc ? CovFunc->getNumUses() : 0;
IRB.CreateCall(AsanCovModuleInit, ConstantInt::get(IntptrTy, nCov));
}
size_t n = GlobalsToChange.size();
if (n == 0) return false;
@@ -1134,6 +1111,36 @@ bool AddressSanitizerModule::runOnModule(Module &M) {
return true;
}
bool AddressSanitizerModule::runOnModule(Module &M) {
DataLayoutPass *DLP = getAnalysisIfAvailable<DataLayoutPass>();
if (!DLP)
return false;
DL = &DLP->getDataLayout();
BL.reset(SpecialCaseList::createOrDie(BlacklistFile));
C = &(M.getContext());
int LongSize = DL->getPointerSizeInBits();
IntptrTy = Type::getIntNTy(*C, LongSize);
Mapping = getShadowMapping(M, LongSize);
initializeCallbacks(M);
bool Changed = false;
Function *CtorFunc = M.getFunction(kAsanModuleCtorName);
assert(CtorFunc);
IRBuilder<> IRB(CtorFunc->getEntryBlock().getTerminator());
if (ClCoverage > 0) {
Function *CovFunc = M.getFunction(kAsanCovName);
int nCov = CovFunc ? CovFunc->getNumUses() : 0;
IRB.CreateCall(AsanCovModuleInit, ConstantInt::get(IntptrTy, nCov));
Changed = true;
}
if (ClGlobals && !BL->isIn(M)) Changed |= InstrumentGlobals(IRB, M);
return Changed;
}
void AddressSanitizer::initializeCallbacks(Module &M) {
IRBuilder<> IRB(*C);
// Create __asan_report* callbacks.