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];
 };
 }