From: Erich Keane <erich.keane@intel.com>
Date: Thu, 8 Feb 2018 23:49:40 +0000 (+0000)
Subject: Add size to constexpr Arrays
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=642adaa162a03ad3c0d3bbeea8d012fc9e3104ce;p=clang

Add size to constexpr Arrays

What seems to be a bug in older versions of MSVC, constexpr
member arrays with a redefinition (to force emission) require
their initial definition to have the size between the brackets.


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

diff --git a/lib/Basic/Targets/AMDGPU.h b/lib/Basic/Targets/AMDGPU.h
index 26d4c7f636..38794eef2b 100644
--- a/lib/Basic/Targets/AMDGPU.h
+++ b/lib/Basic/Targets/AMDGPU.h
@@ -69,7 +69,7 @@ class LLVM_LIBRARY_VISIBILITY AMDGPUTargetInfo final : public TargetInfo {
     AMDGPUTargetInfo::GPUKind Kind;
   };
 
-  static constexpr NameGPUKind R600Names[] = {
+  static constexpr NameGPUKind R600Names[25] = {
       {{"r600"}, GK_R600},
       {{"rv610"}, GK_R600},
       {{"rv620"}, GK_R600},
@@ -96,7 +96,7 @@ class LLVM_LIBRARY_VISIBILITY AMDGPUTargetInfo final : public TargetInfo {
       {{"cayman"}, GK_CAYMAN},
       {{"aruba"}, GK_CAYMAN},
   };
-  static constexpr NameGPUKind AMDGCNNames[] = {
+  static constexpr NameGPUKind AMDGCNNames[33] = {
       {{"gfx600"}, GK_GFX6},    {{"tahiti"}, GK_GFX6},
       {{"gfx601"}, GK_GFX6},    {{"pitcairn"}, GK_GFX6},
       {{"verde"}, GK_GFX6},     {{"oland"}, GK_GFX6},