]> granicus.if.org Git - clang/commitdiff
Value initialize non-class array members in ctor's
authorFariborz Jahanian <fjahanian@apple.com>
Wed, 11 Nov 2009 17:55:25 +0000 (17:55 +0000)
committerFariborz Jahanian <fjahanian@apple.com>
Wed, 11 Nov 2009 17:55:25 +0000 (17:55 +0000)
initializer list. Fixes PR5463.

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

lib/CodeGen/CGCXX.cpp
test/CodeGenCXX/array-value-initialize.cpp [new file with mode: 0644]

index 40e90ee4338c801c4023b4f795ba58c9beb653ef..3e9951f83b4a70b0d09d0244d21927c63383093d 100644 (file)
@@ -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/test/CodeGenCXX/array-value-initialize.cpp b/test/CodeGenCXX/array-value-initialize.cpp
new file mode 100644 (file)
index 0000000..f041bc5
--- /dev/null
@@ -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;
+}
+