From 03f62ed9bb386058126776589194d3bf8a72b19b Mon Sep 17 00:00:00 2001
From: Fariborz Jahanian <fjahanian@apple.com>
Date: Wed, 11 Nov 2009 17:55:25 +0000
Subject: [PATCH] Value initialize non-class array members in ctor's
 initializer list. Fixes PR5463.

llvm-svn: 86849
---
 clang/lib/CodeGen/CGCXX.cpp                   |  9 +++++-
 .../CodeGenCXX/array-value-initialize.cpp     | 28 +++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 clang/test/CodeGenCXX/array-value-initialize.cpp

diff --git a/clang/lib/CodeGen/CGCXX.cpp b/clang/lib/CodeGen/CGCXX.cpp
index 40e90ee4338..3e9951f83b4 100644
--- a/clang/lib/CodeGen/CGCXX.cpp
+++ b/clang/lib/CodeGen/CGCXX.cpp
@@ -1511,7 +1511,14 @@ static void EmitMemberInitializer(CodeGenFunction &CGF,
     RHS = RValue::get(CGF.CGM.EmitConstantExpr(RhsExpr, FieldType, &CGF));
   else
     RHS = RValue::get(CGF.EmitScalarExpr(RhsExpr, true));
-  CGF.EmitStoreThroughLValue(RHS, LHS, FieldType);
+  if (Array && !FieldType->getAs<RecordType>()) {
+    // value initialize a non-class array data member using arr() syntax in
+    // initializer list.
+    QualType Ty = CGF.getContext().getCanonicalType((Field)->getType());
+    CGF.EmitMemSetToZero(LHS.getAddress(), Ty);
+  }
+  else
+    CGF.EmitStoreThroughLValue(RHS, LHS, FieldType);
 }
 
 /// EmitCtorPrologue - This routine generates necessary code to initialize
diff --git a/clang/test/CodeGenCXX/array-value-initialize.cpp b/clang/test/CodeGenCXX/array-value-initialize.cpp
new file mode 100644
index 00000000000..f041bc584b1
--- /dev/null
+++ b/clang/test/CodeGenCXX/array-value-initialize.cpp
@@ -0,0 +1,28 @@
+// RUN: clang-cc -emit-llvm -o - %s
+
+// PR5463
+extern "C" int printf(...);
+
+struct S {
+  double filler;
+};
+
+struct Foo {
+        Foo(void) : bar_(), dbar_(), sbar_() { 
+	  for (int i = 0; i < 5; i++) {
+	    printf("bar_[%d] = %d\n", i, bar_[i]);
+	    printf("dbar_[%d] = %f\n", i, dbar_[i]);
+	    printf("sbar_[%d].filler = %f\n", i, sbar_[i].filler);
+	  }
+        } 
+
+        int bar_[5];
+        double dbar_[5];
+        S sbar_[5];
+};
+
+int main(void)
+{
+        Foo a;
+}
+