From b284f3407f0c6973a929abe68c96e664f35b245c Mon Sep 17 00:00:00 2001 From: Bjorn Pettersson Date: Mon, 20 May 2019 16:41:08 +0000 Subject: [PATCH] [AMDGPU] Fix std::array initializers to avoid warnings with older tool chains. NFC A std::array is implemented as a template with an array inside a struct. Older versions of clang, like 3.6, require an extra set of curly braces around std::array initializations to avoid warnings. The C++ language was changed regarding this by CWG 1270. So more modern tool chains does not complaing even if leaving out one level of braces. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@361171 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/AMDGPU/AMDGPURegisterBankInfo.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Target/AMDGPU/AMDGPURegisterBankInfo.cpp b/lib/Target/AMDGPU/AMDGPURegisterBankInfo.cpp index bee39c957bf..a6d68f3cd0c 100644 --- a/lib/Target/AMDGPU/AMDGPURegisterBankInfo.cpp +++ b/lib/Target/AMDGPU/AMDGPURegisterBankInfo.cpp @@ -160,7 +160,7 @@ AMDGPURegisterBankInfo::getInstrAlternativeMappingsIntrinsicWSideEffects( }; // rsrc, voffset, offset - const std::array RegSrcOpIdx = { 2, 3, 4 }; + const std::array RegSrcOpIdx = { { 2, 3, 4 } }; return addMappingFromTable<3>(MI, MRI, RegSrcOpIdx, makeArrayRef(Table)); } case Intrinsic::amdgcn_s_buffer_load: { @@ -179,7 +179,7 @@ AMDGPURegisterBankInfo::getInstrAlternativeMappingsIntrinsicWSideEffects( }; // rsrc, offset - const std::array RegSrcOpIdx = { 2, 3 }; + const std::array RegSrcOpIdx = { { 2, 3 } }; return addMappingFromTable<2>(MI, MRI, RegSrcOpIdx, makeArrayRef(Table)); } default: -- 2.50.1