nicolas/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move the code that sets the AddressSafety

Browse Source 
attribute into CodeGenModule::SetLLVMFunctionAttributesForDefinition().

Previously it resided in CodeGenModule::GetOrCreateLLVMFunction, which
for some reason wasn't called for ObjC class methods, see
http://code.google.com/p/address-sanitizer/issues/detail?id=33

llvm-svn: 149605
This commit is contained in:
Alexander Potapenko
2012-02-02 11:49:28 +00:00
parent 9df3de538b
commit ef41fd31d4
2 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
clang/lib/CodeGen/CodeGenModule.cpp
View File

@@ -520,6 +520,13 @@ void CodeGenModule::SetLLVMFunctionAttributesForDefinition(const Decl *D,
else if (Features.getStackProtector() == LangOptions::SSPReq)
F->addFnAttr(llvm::Attribute::StackProtectReq);
if (Features.AddressSanitizer) {
// When AddressSanitizer is enabled, set AddressSafety attribute
// unless __attribute__((no_address_safety_analysis)) is used.
if (!D->hasAttr<NoAddressSafetyAnalysisAttr>())
F->addFnAttr(llvm::Attribute::AddressSafety);
}
unsigned alignment = D->getMaxAlignment() / Context.getCharWidth();
if (alignment)
F->setAlignment(alignment);
@@ -1019,14 +1026,6 @@ CodeGenModule::GetOrCreateLLVMFunction(StringRef MangledName,
if (ExtraAttrs != llvm::Attribute::None)
F->addFnAttr(ExtraAttrs);
if (Features.AddressSanitizer) {
// When AddressSanitizer is enabled, set AddressSafety attribute
// unless __attribute__((no_address_safety_analysis)) is used.
const FunctionDecl *FD = cast_or_null<FunctionDecl>(D.getDecl());
if (!FD || !FD->hasAttr<NoAddressSafetyAnalysisAttr>())
F->addFnAttr(llvm::Attribute::AddressSafety);
}
// This is the first use or definition of a mangled name. If there is a
// deferred decl with this name, remember that we need to emit it at the end
// of the file.