diff options
| author | Anders Carlsson <andersca@mac.com> | 2010-05-22 17:35:42 +0000 |
|---|---|---|
| committer | Anders Carlsson <andersca@mac.com> | 2010-05-22 17:35:42 +0000 |
| commit | 1884eb0b5c55edda4893ddec45e7dbad79758782 (patch) | |
| tree | c1daa9aef185f4ba861efc8c83a3a18bb5b12201 /lib/CodeGen/CGClass.cpp | |
| parent | fb2db4657dc1e305c98d0c48fb1009a9f65b337a (diff) | |
Re-land the fix for PR7139.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@104446 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/CGClass.cpp')
| -rw-r--r-- | lib/CodeGen/CGClass.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/CodeGen/CGClass.cpp b/lib/CodeGen/CGClass.cpp index 82c72288d9..587a68beb2 100644 --- a/lib/CodeGen/CGClass.cpp +++ b/lib/CodeGen/CGClass.cpp @@ -465,7 +465,7 @@ static void EmitMemberInitializer(CodeGenFunction &CGF, /*IsInitializer=*/true); CGF.EmitStoreThroughLValue(RHS, LHS, FieldType); } else if (FieldType->isArrayType() && !MemberInit->getInit()) { - CGF.EmitMemSetToZero(LHS.getAddress(), Field->getType()); + CGF.EmitNullInitialization(LHS.getAddress(), Field->getType()); } else if (!CGF.hasAggregateLLVMType(Field->getType())) { RHS = RValue::get(CGF.EmitScalarExpr(MemberInit->getInit(), true)); CGF.EmitStoreThroughLValue(RHS, LHS, FieldType); |