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

[sanitizer] add nosanitize metadata to more coverage instrumentation instructions 

llvm-svn: 231333
This commit is contained in:
Kostya Serebryany 2015-03-05 01:20:05 +00:00
parent af7e99f2f4
commit 83ce8779d5
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
llvm/lib/Transforms/Instrumentation/SanitizerCoverage.cpp
View File

@ -109,6 +109,7 @@ class SanitizerCoverageModule : public ModulePass {
ArrayRef<Instruction *> IndirCalls); ArrayRef<Instruction *> IndirCalls);
bool InjectCoverage(Function &F, ArrayRef<BasicBlock *> AllBlocks, bool InjectCoverage(Function &F, ArrayRef<BasicBlock *> AllBlocks,
ArrayRef<Instruction *> IndirCalls); ArrayRef<Instruction *> IndirCalls);
void SetNoSanitizeMetada(Instruction *I);
void InjectCoverageAtBlock(Function &F, BasicBlock &BB, bool UseCalls); void InjectCoverageAtBlock(Function &F, BasicBlock &BB, bool UseCalls);
Function *SanCovFunction; Function *SanCovFunction;
Function *SanCovWithCheckFunction; Function *SanCovWithCheckFunction;
@ -306,6 +307,12 @@ void SanitizerCoverageModule::InjectCoverageForIndirectCalls(
} }
} }
void SanitizerCoverageModule::SetNoSanitizeMetada(Instruction *I) {
I->setMetadata(
I->getParent()->getParent()->getParent()->getMDKindID("nosanitize"),
MDNode::get(*C, None));
}
void SanitizerCoverageModule::InjectCoverageAtBlock(Function &F, BasicBlock &BB, void SanitizerCoverageModule::InjectCoverageAtBlock(Function &F, BasicBlock &BB,
bool UseCalls) { bool UseCalls) {
BasicBlock::iterator IP = BB.getFirstInsertionPt(), BE = BB.end(); BasicBlock::iterator IP = BB.getFirstInsertionPt(), BE = BB.end();
@ -335,8 +342,7 @@ void SanitizerCoverageModule::InjectCoverageAtBlock(Function &F, BasicBlock &BB,
LoadInst *Load = IRB.CreateLoad(GuardP); LoadInst *Load = IRB.CreateLoad(GuardP);
Load->setAtomic(Monotonic); Load->setAtomic(Monotonic);
Load->setAlignment(4); Load->setAlignment(4);
Load->setMetadata(F.getParent()->getMDKindID("nosanitize"), SetNoSanitizeMetada(Load);
MDNode::get(*C, None));
Value *Cmp = IRB.CreateICmpSGE(Constant::getNullValue(Load->getType()), Load); Value *Cmp = IRB.CreateICmpSGE(Constant::getNullValue(Load->getType()), Load);
Instruction *Ins = SplitBlockAndInsertIfThen( Instruction *Ins = SplitBlockAndInsertIfThen(
Cmp, IP, false, MDBuilder(*C).createBranchWeights(1, 100000)); Cmp, IP, false, MDBuilder(*C).createBranchWeights(1, 100000));
@ -353,9 +359,11 @@ void SanitizerCoverageModule::InjectCoverageAtBlock(Function &F, BasicBlock &BB,
IRB.CreatePointerCast(EightBitCounterArray, IntptrTy), IRB.CreatePointerCast(EightBitCounterArray, IntptrTy),
ConstantInt::get(IntptrTy, SanCovFunction->getNumUses() - 1)); ConstantInt::get(IntptrTy, SanCovFunction->getNumUses() - 1));
P = IRB.CreateIntToPtr(P, IRB.getInt8PtrTy()); P = IRB.CreateIntToPtr(P, IRB.getInt8PtrTy());
Value *LI = IRB.CreateLoad(P); LoadInst *LI = IRB.CreateLoad(P);
Value *Inc = IRB.CreateAdd(LI, ConstantInt::get(IRB.getInt8Ty(), 1)); Value *Inc = IRB.CreateAdd(LI, ConstantInt::get(IRB.getInt8Ty(), 1));
IRB.CreateStore(Inc, P); StoreInst *SI = IRB.CreateStore(Inc, P);
SetNoSanitizeMetada(LI);
SetNoSanitizeMetada(SI);
} }
if (ClExperimentalTracing) { if (ClExperimentalTracing) {

16
llvm/test/Instrumentation/SanitizerCoverage/coverage.ll
View File

@ -79,18 +79,18 @@ entry:
; test -sanitizer-coverage-8bit-counters=1 ; test -sanitizer-coverage-8bit-counters=1
; CHECK-8BIT-LABEL: define void @foo ; CHECK-8BIT-LABEL: define void @foo
; CHECK-8BIT: [[V11:%[0-9]*]] = load i8 ; CHECK-8BIT: [[V11:%[0-9]*]] = load i8{{.*}}!nosanitize
; CHECK-8BIT: [[V12:%[0-9]*]] = add i8 [[V11]], 1 ; CHECK-8BIT: [[V12:%[0-9]*]] = add i8 [[V11]], 1
; CHECK-8BIT: store i8 [[V12]] ; CHECK-8BIT: store i8 [[V12]]{{.*}}!nosanitize
; CHECK-8BIT: [[V21:%[0-9]*]] = load i8 ; CHECK-8BIT: [[V21:%[0-9]*]] = load i8{{.*}}!nosanitize
; CHECK-8BIT: [[V22:%[0-9]*]] = add i8 [[V21]], 1 ; CHECK-8BIT: [[V22:%[0-9]*]] = add i8 [[V21]], 1
; CHECK-8BIT: store i8 [[V22]] ; CHECK-8BIT: store i8 [[V22]]{{.*}}!nosanitize
; CHECK-8BIT: [[V31:%[0-9]*]] = load i8 ; CHECK-8BIT: [[V31:%[0-9]*]] = load i8{{.*}}!nosanitize
; CHECK-8BIT: [[V32:%[0-9]*]] = add i8 [[V31]], 1 ; CHECK-8BIT: [[V32:%[0-9]*]] = add i8 [[V31]], 1
; CHECK-8BIT: store i8 [[V32]] ; CHECK-8BIT: store i8 [[V32]]{{.*}}!nosanitize
; CHECK-8BIT: [[V41:%[0-9]*]] = load i8 ; CHECK-8BIT: [[V41:%[0-9]*]] = load i8{{.*}}!nosanitize
; CHECK-8BIT: [[V42:%[0-9]*]] = add i8 [[V41]], 1 ; CHECK-8BIT: [[V42:%[0-9]*]] = add i8 [[V41]], 1
; CHECK-8BIT: store i8 [[V42]] ; CHECK-8BIT: store i8 [[V42]]{{.*}}!nosanitize
; CHECK-8BIT: ret void ; CHECK-8BIT: ret void