SIMachineFunctionInfo.cpp: Appease msc18 to use std::array.

llvm-svn: 273860

2 files changed, 5 insertions, 4 deletions

diff --git a/llvm/lib/Target/AMDGPU/SIMachineFunctionInfo.cpp b/llvm/lib/Target/AMDGPU/SIMachineFunctionInfo.cpp
index d86d7eaa915..2c478d5213e 100644
--- a/llvm/lib/Target/AMDGPU/SIMachineFunctionInfo.cpp
+++ b/llvm/lib/Target/AMDGPU/SIMachineFunctionInfo.cpp
@@ -53,8 +53,8 @@ SIMachineFunctionInfo::SIMachineFunctionInfo(const MachineFunction &MF)
     ReturnsVoid(true),
     MaximumWorkGroupSize(0),
     DebuggerReservedVGPRCount(0),
-    DebuggerWorkGroupIDStackObjectIndices{0, 0, 0},
-    DebuggerWorkItemIDStackObjectIndices{0, 0, 0},
+    DebuggerWorkGroupIDStackObjectIndices({{0, 0, 0}}),
+    DebuggerWorkItemIDStackObjectIndices({{0, 0, 0}}),
     LDSWaveSpillSize(0),
     PSInputEna(0),
     NumUserSGPRs(0),
diff --git a/llvm/lib/Target/AMDGPU/SIMachineFunctionInfo.h b/llvm/lib/Target/AMDGPU/SIMachineFunctionInfo.h
index a0d95d56519..33d41926440 100644
--- a/llvm/lib/Target/AMDGPU/SIMachineFunctionInfo.h
+++ b/llvm/lib/Target/AMDGPU/SIMachineFunctionInfo.h
@@ -16,6 +16,7 @@
 
 #include "AMDGPUMachineFunction.h"
 #include "SIRegisterInfo.h"
+#include <array>
 #include <map>
 
 namespace llvm {
@@ -65,9 +66,9 @@ class SIMachineFunctionInfo final : public AMDGPUMachineFunction {
   // Number of reserved VGPRs for debugger usage.
   unsigned DebuggerReservedVGPRCount;
   // Stack object indices for work group IDs.
-  int DebuggerWorkGroupIDStackObjectIndices[3];
+  std::array<int, 3> DebuggerWorkGroupIDStackObjectIndices;
   // Stack object indices for work item IDs.
-  int DebuggerWorkItemIDStackObjectIndices[3];
+  std::array<int, 3> DebuggerWorkItemIDStackObjectIndices;
 
 public:
   // FIXME: Make private