From: Bjorn Pettersson <bjorn.a.pettersson@ericsson.com>
Date: Mon, 20 May 2019 16:41:08 +0000 (+0000)
Subject: [AMDGPU] Fix std::array initializers to avoid warnings with older tool chains. NFC
X-Git-Tag: llvmorg-9.0.0-rc1~5154
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=eee0f2330dcf80a395e23a803f5d102cb1d5c2cc;p=platform%2Fupstream%2Fllvm.git

[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.

llvm-svn: 361171
---

diff --git a/llvm/lib/Target/AMDGPU/AMDGPURegisterBankInfo.cpp b/llvm/lib/Target/AMDGPU/AMDGPURegisterBankInfo.cpp
index bee39c957bfe..a6d68f3cd0cd 100644
--- a/llvm/lib/Target/AMDGPU/AMDGPURegisterBankInfo.cpp
+++ b/llvm/lib/Target/AMDGPU/AMDGPURegisterBankInfo.cpp
@@ -160,7 +160,7 @@ AMDGPURegisterBankInfo::getInstrAlternativeMappingsIntrinsicWSideEffects(
     };
 
     // rsrc, voffset, offset
-    const std::array<unsigned, 3> RegSrcOpIdx = { 2, 3, 4 };
+    const std::array<unsigned, 3> 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<unsigned, 2> RegSrcOpIdx = { 2, 3 };
+    const std::array<unsigned, 2> RegSrcOpIdx = { { 2, 3 } };
     return addMappingFromTable<2>(MI, MRI, RegSrcOpIdx, makeArrayRef(Table));
   }
   default: