fix PR3427: fix debuginfo for incomplete array types

llvm-svn: 63158

2 files changed, 12 insertions, 3 deletions

diff --git a/clang/lib/CodeGen/CGDebugInfo.cpp b/clang/lib/CodeGen/CGDebugInfo.cpp
index e0a52d61844..79abc340644 100644
--- a/clang/lib/CodeGen/CGDebugInfo.cpp
+++ b/clang/lib/CodeGen/CGDebugInfo.cpp
@@ -337,11 +337,14 @@ llvm::DIType CGDebugInfo::CreateType(const ArrayType *Ty,
   uint64_t Align;
   
   
+  // FIXME: make getTypeAlign() aware of VLAs and incomplete array types
   if (const VariableArrayType *VAT = dyn_cast<VariableArrayType>(Ty)) {
-
     Size = 0;
     Align =
-      M->getContext().getTypeSize(M->getContext().getBaseElementType(VAT));
+      M->getContext().getTypeAlign(M->getContext().getBaseElementType(VAT));
+  } else if (Ty->isIncompleteArrayType()) {
+    Size = 0;
+    Align = M->getContext().getTypeAlign(Ty->getElementType());
   } else {
     // Size and align of the whole array, not the element type.
     Size = M->getContext().getTypeSize(Ty);
diff --git a/clang/test/CodeGen/debug-info.c b/clang/test/CodeGen/debug-info.c
index f5a31631fba..2ecae9fa6d5 100644
--- a/clang/test/CodeGen/debug-info.c
+++ b/clang/test/CodeGen/debug-info.c
@@ -18,7 +18,13 @@ struct s0 { struct s0 *p; } g0;
 struct s0 *f0(struct s0 *a0) {
   return a0->p;
 }
-  
+
 // PR3134
 char xpto[];
 
+// PR3427
+struct foo {
+	int a;
+	void *ptrs[];
+};
+struct foo bar;