aboutsummaryrefslogtreecommitdiff
path: root/lib/CodeGen/CGCXX.cpp
diff options
context:
space:
mode:
authorFariborz Jahanian <fjahanian@apple.com>2009-11-11 17:55:25 +0000
committerFariborz Jahanian <fjahanian@apple.com>2009-11-11 17:55:25 +0000
commite8b31cc500473f0e2558c77c8a46458deff6ce51 (patch)
treebfb0b3fca2ab6d10d29588496729cab6d3769f5b /lib/CodeGen/CGCXX.cpp
parentab6d6229cd7659ee49974d0116fe8bca06d7d128 (diff)
Value initialize non-class array members in ctor's
initializer list. Fixes PR5463. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@86849 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/CGCXX.cpp')
-rw-r--r--lib/CodeGen/CGCXX.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/CodeGen/CGCXX.cpp b/lib/CodeGen/CGCXX.cpp
index 40e90ee433..3e9951f83b 100644
--- a/lib/CodeGen/CGCXX.cpp
+++ b/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