diff options
| -rw-r--r-- | lib/CodeGen/CGCXX.cpp | 4 | ||||
| -rw-r--r-- | lib/CodeGen/CodeGenModule.cpp | 15 | ||||
| -rw-r--r-- | lib/CodeGen/CodeGenModule.h | 6 |
3 files changed, 10 insertions, 15 deletions
diff --git a/lib/CodeGen/CGCXX.cpp b/lib/CodeGen/CGCXX.cpp index ef29af7e07..d2b6276347 100644 --- a/lib/CodeGen/CGCXX.cpp +++ b/lib/CodeGen/CGCXX.cpp @@ -217,7 +217,7 @@ void CodeGenModule::EmitCXXConstructor(const CXXConstructorDecl *ctor, CodeGenFunction(*this).GenerateCode(GlobalDecl(ctor, ctorType), fn, fnInfo); - SetFunctionDefinitionAttributes(ctor, fn); + setFunctionDefinitionAttributes(ctor, fn); SetLLVMFunctionAttributesForDefinition(ctor, fn); } @@ -274,7 +274,7 @@ void CodeGenModule::EmitCXXDestructor(const CXXDestructorDecl *dtor, CodeGenFunction(*this).GenerateCode(GlobalDecl(dtor, dtorType), fn, fnInfo); - SetFunctionDefinitionAttributes(dtor, fn); + setFunctionDefinitionAttributes(dtor, fn); SetLLVMFunctionAttributesForDefinition(dtor, fn); } diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp index 22ff2081c6..cdd240ee2a 100644 --- a/lib/CodeGen/CodeGenModule.cpp +++ b/lib/CodeGen/CodeGenModule.cpp @@ -594,14 +594,9 @@ CodeGenModule::getFunctionLinkage(GlobalDecl GD) { UseThunkForDtorVariant); } - -/// SetFunctionDefinitionAttributes - Set attributes for a global. -/// -/// FIXME: This is currently only done for aliases and functions, but not for -/// variables (these details are set in EmitGlobalVarDefinition for variables). -void CodeGenModule::SetFunctionDefinitionAttributes(const FunctionDecl *D, - llvm::GlobalValue *GV) { - setNonAliasAttributes(D, GV); +void CodeGenModule::setFunctionDefinitionAttributes(const FunctionDecl *D, + llvm::Function *F) { + setNonAliasAttributes(D, F); } void CodeGenModule::SetLLVMFunctionAttributes(const Decl *D, @@ -2247,14 +2242,14 @@ void CodeGenModule::EmitGlobalFunctionDefinition(GlobalDecl GD, llvm::Function *Fn = cast<llvm::Function>(GV); setFunctionLinkage(GD, Fn); - // FIXME: this is redundant with part of SetFunctionDefinitionAttributes + // FIXME: this is redundant with part of setFunctionDefinitionAttributes setGlobalVisibility(Fn, D); MaybeHandleStaticInExternC(D, Fn); CodeGenFunction(*this).GenerateCode(D, Fn, FI); - SetFunctionDefinitionAttributes(D, Fn); + setFunctionDefinitionAttributes(D, Fn); SetLLVMFunctionAttributesForDefinition(D, Fn); if (const ConstructorAttr *CA = D->getAttr<ConstructorAttr>()) diff --git a/lib/CodeGen/CodeGenModule.h b/lib/CodeGen/CodeGenModule.h index 38e85e62d1..f601bfd4d6 100644 --- a/lib/CodeGen/CodeGenModule.h +++ b/lib/CodeGen/CodeGenModule.h @@ -1061,9 +1061,9 @@ private: void setNonAliasAttributes(const Decl *D, llvm::GlobalValue *GV); - /// SetFunctionDefinitionAttributes - Set attributes for a global definition. - void SetFunctionDefinitionAttributes(const FunctionDecl *D, - llvm::GlobalValue *GV); + /// Set attributes for a global definition. + void setFunctionDefinitionAttributes(const FunctionDecl *D, + llvm::Function *F); /// SetFunctionAttributes - Set function attributes for a function /// declaration. |