Author: scott.linder Date: Tue Apr 23 14:50:11 2019 New Revision: 359039 URL: http://llvm.org/viewvc/llvm-project?rev=359039&view=rev Log: Move setTargetAttributes after setGVProperties in SetFunctionAttributes
AMDGPU currently relies on global properties being set before setTargetProperties is called. Existing targets like MIPS which rely on setTargetProperties do not rely on the current behavior, so this patch moves the call later in SetFunctionAttributes. Differential Revision: https://reviews.llvm.org/D60967 Modified: cfe/trunk/lib/CodeGen/CodeGenModule.cpp cfe/trunk/test/CodeGenOpenCL/visibility.cl Modified: cfe/trunk/lib/CodeGen/CodeGenModule.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenModule.cpp?rev=359039&r1=359038&r2=359039&view=diff ============================================================================== --- cfe/trunk/lib/CodeGen/CodeGenModule.cpp (original) +++ cfe/trunk/lib/CodeGen/CodeGenModule.cpp Tue Apr 23 14:50:11 2019 @@ -1558,12 +1558,8 @@ void CodeGenModule::SetFunctionAttribute const auto *FD = cast<FunctionDecl>(GD.getDecl()); - if (!IsIncompleteFunction) { + if (!IsIncompleteFunction) SetLLVMFunctionAttributes(GD, getTypes().arrangeGlobalDeclaration(GD), F); - // Setup target-specific attributes. - if (F->isDeclaration()) - getTargetCodeGenInfo().setTargetAttributes(FD, F, *this); - } // Add the Returned attribute for "this", except for iOS 5 and earlier // where substantial code, including the libstdc++ dylib, was compiled with @@ -1583,6 +1579,10 @@ void CodeGenModule::SetFunctionAttribute setLinkageForGV(F, FD); setGVProperties(F, FD); + // Setup target-specific attributes. + if (!IsIncompleteFunction && F->isDeclaration()) + getTargetCodeGenInfo().setTargetAttributes(FD, F, *this); + if (const auto *CSA = FD->getAttr<CodeSegAttr>()) F->setSection(CSA->getName()); else if (const auto *SA = FD->getAttr<SectionAttr>()) Modified: cfe/trunk/test/CodeGenOpenCL/visibility.cl URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenOpenCL/visibility.cl?rev=359039&r1=359038&r2=359039&view=diff ============================================================================== --- cfe/trunk/test/CodeGenOpenCL/visibility.cl (original) +++ cfe/trunk/test/CodeGenOpenCL/visibility.cl Tue Apr 23 14:50:11 2019 @@ -72,6 +72,57 @@ __attribute__((visibility("protected"))) // FVIS-HIDDEN: define void @func_default() __attribute__((visibility("default"))) void func_default() {} +extern kernel void ext_kern(); +__attribute__((visibility("hidden"))) extern kernel void ext_kern_hidden(); +__attribute__((visibility("protected"))) extern kernel void ext_kern_protected(); +__attribute__((visibility("default"))) extern kernel void ext_kern_default(); + +extern void ext_func(); +__attribute__((visibility("hidden"))) extern void ext_func_hidden(); +__attribute__((visibility("protected"))) extern void ext_func_protected(); +__attribute__((visibility("default"))) extern void ext_func_default(); + void use() { glob = ext + ext_hidden + ext_protected + ext_default; + ext_kern(); + ext_kern_hidden(); + ext_kern_protected(); + ext_kern_default(); + ext_func(); + ext_func_hidden(); + ext_func_protected(); + ext_func_default(); } + +// FVIS-DEFAULT: declare amdgpu_kernel void @ext_kern() +// FVIS-PROTECTED: declare protected amdgpu_kernel void @ext_kern() +// FVIS-HIDDEN: declare protected amdgpu_kernel void @ext_kern() + +// FVIS-DEFAULT: declare protected amdgpu_kernel void @ext_kern_hidden() +// FVIS-PROTECTED: declare protected amdgpu_kernel void @ext_kern_hidden() +// FVIS-HIDDEN: declare protected amdgpu_kernel void @ext_kern_hidden() + +// FVIS-DEFAULT: declare protected amdgpu_kernel void @ext_kern_protected() +// FVIS-PROTECTED: declare protected amdgpu_kernel void @ext_kern_protected() +// FVIS-HIDDEN: declare protected amdgpu_kernel void @ext_kern_protected() + +// FVIS-DEFAULT: declare amdgpu_kernel void @ext_kern_default() +// FVIS-PROTECTED: declare amdgpu_kernel void @ext_kern_default() +// FVIS-HIDDEN: declare amdgpu_kernel void @ext_kern_default() + + +// FVIS-DEFAULT: declare void @ext_func() +// FVIS-PROTECTED: declare protected void @ext_func() +// FVIS-HIDDEN: declare hidden void @ext_func() + +// FVIS-DEFAULT: declare hidden void @ext_func_hidden() +// FVIS-PROTECTED: declare hidden void @ext_func_hidden() +// FVIS-HIDDEN: declare hidden void @ext_func_hidden() + +// FVIS-DEFAULT: declare protected void @ext_func_protected() +// FVIS-PROTECTED: declare protected void @ext_func_protected() +// FVIS-HIDDEN: declare protected void @ext_func_protected() + +// FVIS-DEFAULT: declare void @ext_func_default() +// FVIS-PROTECTED: declare void @ext_func_default() +// FVIS-HIDDEN: declare void @ext_func_default() _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
