From 2b2fa1f473785ebef59aa2c3a906b211ca87457c Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Tue, 27 Feb 2018 23:44:36 +0000 Subject: [PATCH] Pass a GlobalDecl to setFunctionDefinitionAttributes. NFC. This just makes a followup patch easier to read. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@326265 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/CGCXX.cpp | 2 +- lib/CodeGen/CodeGenModule.cpp | 6 +++--- lib/CodeGen/CodeGenModule.h | 3 +-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/CodeGen/CGCXX.cpp b/lib/CodeGen/CGCXX.cpp index 5ef4dc45fb..d50e4bc055 100644 --- a/lib/CodeGen/CGCXX.cpp +++ b/lib/CodeGen/CGCXX.cpp @@ -230,7 +230,7 @@ llvm::Function *CodeGenModule::codegenCXXStructor(const CXXMethodDecl *MD, setFunctionDLLStorageClass(GD, Fn); CodeGenFunction(*this).GenerateCode(GD, Fn, FnInfo); - setFunctionDefinitionAttributes(MD, Fn); + setFunctionDefinitionAttributes(GD, Fn); SetLLVMFunctionAttributesForDefinition(MD, Fn); return Fn; } diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp index 588d001111..36a0b9e9e4 100644 --- a/lib/CodeGen/CodeGenModule.cpp +++ b/lib/CodeGen/CodeGenModule.cpp @@ -1080,9 +1080,9 @@ llvm::ConstantInt *CodeGenModule::CreateCrossDsoCfiTypeId(llvm::Metadata *MD) { return llvm::ConstantInt::get(Int64Ty, llvm::MD5Hash(MDS->getString())); } -void CodeGenModule::setFunctionDefinitionAttributes(const FunctionDecl *D, +void CodeGenModule::setFunctionDefinitionAttributes(GlobalDecl GD, llvm::Function *F) { - setNonAliasAttributes(D, F); + setNonAliasAttributes(GD.getDecl(), F); } void CodeGenModule::SetLLVMFunctionAttributes(const Decl *D, @@ -3591,7 +3591,7 @@ void CodeGenModule::EmitGlobalFunctionDefinition(GlobalDecl GD, CodeGenFunction(*this).GenerateCode(D, Fn, FI); - setFunctionDefinitionAttributes(D, Fn); + setFunctionDefinitionAttributes(GD, Fn); SetLLVMFunctionAttributesForDefinition(D, Fn); if (const ConstructorAttr *CA = D->getAttr()) diff --git a/lib/CodeGen/CodeGenModule.h b/lib/CodeGen/CodeGenModule.h index c8b2d7880d..40a9d93241 100644 --- a/lib/CodeGen/CodeGenModule.h +++ b/lib/CodeGen/CodeGenModule.h @@ -1183,8 +1183,7 @@ public: bool TryEmitBaseDestructorAsAlias(const CXXDestructorDecl *D); /// Set attributes for a global definition. - void setFunctionDefinitionAttributes(const FunctionDecl *D, - llvm::Function *F); + void setFunctionDefinitionAttributes(GlobalDecl GD, llvm::Function *F); llvm::GlobalValue *GetGlobalValue(StringRef Ref); -- 2.40.0