From: Timur Iskhodzhanov <timurrrr@google.com>
Date: Tue, 29 Oct 2013 12:13:22 +0000 (+0000)
Subject: Quick-fix DebugInfo build on Windows
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=45d2e6492c48d41267f2d7576028422554c9875e;p=oota-llvm.git

Quick-fix DebugInfo build on Windows

MSVC can't comprehend
  template<typename T, size_t N>
  ArrayRef<T> makeArrayRef(const T (&Arr)[N]) {
    return ArrayRef<T>(Arr);
  }
if Arr is
  static const uint8_t sizes[];
declared in a templated and defined a few lines later.

I'll send a proper fix (i.e. get rid of unnecessary templates) for review soon.



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

diff --git a/lib/DebugInfo/DWARFFormValue.cpp b/lib/DebugInfo/DWARFFormValue.cpp
index 2ee393494ec..c28f0dd5997 100644
--- a/lib/DebugInfo/DWARFFormValue.cpp
+++ b/lib/DebugInfo/DWARFFormValue.cpp
@@ -22,7 +22,9 @@ using namespace dwarf;
 
 namespace {
 template <uint8_t AddrSize, uint8_t RefAddrSize> struct FixedFormSizes {
-  static const uint8_t sizes[];
+  // FIXME: do we need a template here?  Will a stack-allocated struct with
+  // an initializer in getFixedFormSizes() work just fine?
+  static const uint8_t sizes[27];
 };
 }