From 678af17920c33ca7ec1178f861a62d540937ec35 Mon Sep 17 00:00:00 2001 From: Kostya Serebryany Date: Mon, 24 Nov 2014 18:49:53 +0000 Subject: [PATCH] [asan/coverage] change the way asan coverage instrumentation is done: instead of setting the guard to 1 in the generated code, pass the pointer to guard to __sanitizer_cov and set it there. No user-visible functionality change expected git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@222675 91177308-0d34-0410-b5e6-96231b3b80d8 --- .../Instrumentation/SanitizerCoverage.cpp | 17 +++++++---------- .../SanitizerCoverage/coverage-dbg.ll | 2 +- .../SanitizerCoverage/coverage.ll | 4 ++-- .../SanitizerCoverage/coverage2-dbg.ll | 6 +++--- 4 files changed, 13 insertions(+), 16 deletions(-) diff --git a/lib/Transforms/Instrumentation/SanitizerCoverage.cpp b/lib/Transforms/Instrumentation/SanitizerCoverage.cpp index f882072e619..60d7f9f69d7 100644 --- a/lib/Transforms/Instrumentation/SanitizerCoverage.cpp +++ b/lib/Transforms/Instrumentation/SanitizerCoverage.cpp @@ -13,9 +13,8 @@ // We create a Guard boolean variable with the same linkage // as the function and inject this code into the entry block (CoverageLevel=1) // or all blocks (CoverageLevel>=2): -// if (*Guard) { -// __sanitizer_cov(); -// *Guard = 1; +// if (Guard) { +// __sanitizer_cov(&Guard); // } // The accesses to Guard are atomic. The rest of the logic is // in __sanitizer_cov (it's fine to call it more than once). @@ -132,6 +131,7 @@ bool SanitizerCoverageModule::runOnModule(Module &M) { DataLayoutPass *DLP = &getAnalysis(); IntptrTy = Type::getIntNTy(*C, DLP->getDataLayout().getPointerSizeInBits()); Type *VoidTy = Type::getVoidTy(*C); + IRBuilder<> IRB(*C); Function *CtorFunc = Function::Create(FunctionType::get(VoidTy, false), @@ -139,8 +139,8 @@ bool SanitizerCoverageModule::runOnModule(Module &M) { ReturnInst::Create(*C, BasicBlock::Create(*C, "", CtorFunc)); appendToGlobalCtors(M, CtorFunc, kSanCtorAndDtorPriority); - SanCovFunction = - checkInterfaceFunction(M.getOrInsertFunction(kSanCovName, VoidTy, nullptr)); + SanCovFunction = checkInterfaceFunction( + M.getOrInsertFunction(kSanCovName, VoidTy, IRB.getInt8PtrTy(), nullptr)); SanCovIndirCallFunction = checkInterfaceFunction(M.getOrInsertFunction( kSanCovIndirCallName, VoidTy, IntptrTy, IntptrTy, nullptr)); SanCovModuleInit = checkInterfaceFunction(M.getOrInsertFunction( @@ -157,7 +157,7 @@ bool SanitizerCoverageModule::runOnModule(Module &M) { for (auto &F : M) runOnFunction(F); - IRBuilder<> IRB(CtorFunc->getEntryBlock().getTerminator()); + IRB.SetInsertPoint(CtorFunc->getEntryBlock().getTerminator()); IRB.CreateCall(SanCovModuleInit, ConstantInt::get(IntptrTy, SanCovFunction->getNumUses())); return true; @@ -279,10 +279,7 @@ void SanitizerCoverageModule::InjectCoverageAtBlock(Function &F, IRB.SetInsertPoint(Ins); IRB.SetCurrentDebugLocation(EntryLoc); // __sanitizer_cov gets the PC of the instruction using GET_CALLER_PC. - IRB.CreateCall(SanCovFunction); - StoreInst *Store = IRB.CreateStore(ConstantInt::get(Int8Ty, 1), Guard); - Store->setAtomic(Monotonic); - Store->setAlignment(1); + IRB.CreateCall(SanCovFunction, Guard); } char SanitizerCoverageModule::ID = 0; diff --git a/test/Instrumentation/SanitizerCoverage/coverage-dbg.ll b/test/Instrumentation/SanitizerCoverage/coverage-dbg.ll index eea93b8a44b..3520f8a2e20 100644 --- a/test/Instrumentation/SanitizerCoverage/coverage-dbg.ll +++ b/test/Instrumentation/SanitizerCoverage/coverage-dbg.ll @@ -15,7 +15,7 @@ ; and add sanitize_address to @_ZN1A1fEv ; Test that __sanitizer_cov call has !dbg pointing to the opening { of A::f(). -; CHECK: call void @__sanitizer_cov(), !dbg [[A:!.*]] +; CHECK: call void @__sanitizer_cov(i8*{{.*}}), !dbg [[A:!.*]] ; CHECK: [[A]] = metadata !{i32 6, i32 0, metadata !{{.*}}, null} diff --git a/test/Instrumentation/SanitizerCoverage/coverage.ll b/test/Instrumentation/SanitizerCoverage/coverage.ll index da0498db642..2d9a56ac1fe 100644 --- a/test/Instrumentation/SanitizerCoverage/coverage.ll +++ b/test/Instrumentation/SanitizerCoverage/coverage.ll @@ -36,9 +36,9 @@ entry: ; CHECK1: %0 = load atomic i8* @__sancov_gen_cov_foo monotonic, align 1 ; CHECK1: %1 = icmp eq i8 0, %0 ; CHECK1: br i1 %1, label %2, label %3 -; CHECK1: call void @__sanitizer_cov +; CHECK1: call void @__sanitizer_cov(i8*{{.*}}) ; CHECK1-NOT: call void @__sanitizer_cov -; CHECK1: store atomic i8 1, i8* @__sancov_gen_cov_foo monotonic, align 1 +; CHECK1: ret void ; CHECK1-LABEL: define internal void @sancov.module_ctor ; CHECK1-NOT: ret diff --git a/test/Instrumentation/SanitizerCoverage/coverage2-dbg.ll b/test/Instrumentation/SanitizerCoverage/coverage2-dbg.ll index 9b263293bf4..f351fe15d42 100644 --- a/test/Instrumentation/SanitizerCoverage/coverage2-dbg.ll +++ b/test/Instrumentation/SanitizerCoverage/coverage2-dbg.ll @@ -17,9 +17,9 @@ target triple = "x86_64-unknown-linux-gnu" ; Check that __sanitizer_cov call has !dgb pointing to the beginning ; of appropriate basic blocks. ; CHECK-LABEL:_Z3fooPi -; CHECK: call void @__sanitizer_cov(), !dbg [[A:!.*]] -; CHECK: call void @__sanitizer_cov(), !dbg [[B:!.*]] -; CHECK: call void @__sanitizer_cov(), !dbg [[C:!.*]] +; CHECK: call void @__sanitizer_cov(i8*{{.*}}), !dbg [[A:!.*]] +; CHECK: call void @__sanitizer_cov(i8*{{.*}}), !dbg [[B:!.*]] +; CHECK: call void @__sanitizer_cov(i8*{{.*}}), !dbg [[C:!.*]] ; CHECK: ret void ; CHECK: [[A]] = metadata !{i32 1, i32 0, metadata !{{.*}}, null} ; CHECK: [[B]] = metadata !{i32 3, i32 5, metadata !{{.*}}, null} -- 2.34.1