[llvm] r273860 - SIMachineFunctionInfo.cpp: Appease msc18 to use std::array.

[NAKAMURA Takumi via llvm-commits]

Author: chapuni
Date: Mon Jun 27 05:26:43 2016
New Revision: 273860

URL: http://llvm.org/viewvc/llvm-project?rev=273860&view=rev
Log:
SIMachineFunctionInfo.cpp: Appease msc18 to use std::array.

Modified:
    llvm/trunk/lib/Target/AMDGPU/SIMachineFunctionInfo.cpp
    llvm/trunk/lib/Target/AMDGPU/SIMachineFunctionInfo.h

Modified: llvm/trunk/lib/Target/AMDGPU/SIMachineFunctionInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AMDGPU/SIMachineFunctionInfo.cpp?rev=273860&r1=273859&r2=273860&view=diff
==============================================================================
--- llvm/trunk/lib/Target/AMDGPU/SIMachineFunctionInfo.cpp (original)
+++ llvm/trunk/lib/Target/AMDGPU/SIMachineFunctionInfo.cpp Mon Jun 27 05:26:43 2016
@@ -53,8 +53,8 @@ SIMachineFunctionInfo::SIMachineFunction
     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),

Modified: llvm/trunk/lib/Target/AMDGPU/SIMachineFunctionInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AMDGPU/SIMachineFunctionInfo.h?rev=273860&r1=273859&r2=273860&view=diff
==============================================================================
--- llvm/trunk/lib/Target/AMDGPU/SIMachineFunctionInfo.h (original)
+++ llvm/trunk/lib/Target/AMDGPU/SIMachineFunctionInfo.h Mon Jun 27 05:26:43 2016
@@ -16,6 +16,7 @@
 
 #include "AMDGPUMachineFunction.h"
 #include "SIRegisterInfo.h"
+#include <array>
 #include <map>
 
 namespace llvm {
@@ -65,9 +66,9 @@ class SIMachineFunctionInfo final : publ
   // 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