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

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@273860 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Target/AMDGPU/SIMachineFunctionInfo.cpp b/lib/Target/AMDGPU/SIMachineFunctionInfo.cpp
index d86d7eaa9150b626f90e62e1fee6e3989d041a81..2c478d5213e4d483778732ab6754c043f795ecf7 100644 (file)
--- a/lib/Target/AMDGPU/SIMachineFunctionInfo.cpp
+++ b/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/lib/Target/AMDGPU/SIMachineFunctionInfo.h b/lib/Target/AMDGPU/SIMachineFunctionInfo.h
index a0d95d56519a94931cc630c3750534f1b99ba5c4..33d419264400722ea4634e05926d066bc0b4b236 100644 (file)
--- a/lib/Target/AMDGPU/SIMachineFunctionInfo.h
+++ b/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