diff options
| -rw-r--r-- | lib/CodeGen/CGCXX.cpp | 9 | ||||
| -rw-r--r-- | test/CodeGenCXX/array-value-initialize.cpp | 28 |
2 files changed, 36 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 diff --git a/test/CodeGenCXX/array-value-initialize.cpp b/test/CodeGenCXX/array-value-initialize.cpp new file mode 100644 index 0000000000..f041bc584b --- /dev/null +++ b/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; +} + |