From c054d9813c9c7f8f2c95d78bc171bf761d2e73fc Mon Sep 17 00:00:00 2001 From: Alexey Samsonov Date: Thu, 29 May 2014 01:43:53 +0000 Subject: [ASan] Hoist blacklisting globals from init-order checking to Clang. Clang knows about the sanitizer blacklist and it makes no sense to add global to the list of llvm.asan.dynamically_initialized_globals if it will be blacklisted in the instrumentation pass anyway. Instead, we should do as much blacklisting as possible (if not all) in the frontend. llvm-svn: 209789 --- clang/lib/CodeGen/CodeGenModule.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'clang/lib/CodeGen/CodeGenModule.cpp') diff --git a/clang/lib/CodeGen/CodeGenModule.cpp b/clang/lib/CodeGen/CodeGenModule.cpp index c55e231..484373b 100644 --- a/clang/lib/CodeGen/CodeGenModule.cpp +++ b/clang/lib/CodeGen/CodeGenModule.cpp @@ -1878,12 +1878,11 @@ void CodeGenModule::EmitGlobalVarDefinition(const VarDecl *D) { EmitCXXGlobalVarDeclInitFunc(D, GV, NeedsGlobalCtor); // If we are compiling with ASan, add metadata indicating dynamically - // initialized globals. - if (SanOpts.Address && NeedsGlobalCtor) { - llvm::Module &M = getModule(); - - llvm::NamedMDNode *DynamicInitializers = - M.getOrInsertNamedMetadata("llvm.asan.dynamically_initialized_globals"); + // initialized (and not blacklisted) globals. + if (SanOpts.Address && NeedsGlobalCtor && + !SanitizerBlacklist->isIn(*GV, "init")) { + llvm::NamedMDNode *DynamicInitializers = TheModule.getOrInsertNamedMetadata( + "llvm.asan.dynamically_initialized_globals"); llvm::Value *GlobalToAdd[] = { GV }; llvm::MDNode *ThisGlobal = llvm::MDNode::get(VMContext, GlobalToAdd); DynamicInitializers->addOperand(ThisGlobal); -- cgit v1.1