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 | c0964b60e501872e35c51db23f5fe6a6a5523091 (patch) | |
| tree | 07a2ceb59aeb2463a21a30b0cc6ee40c64509bca /clang/lib/CodeGen/CGClass.cpp | |
| parent | 024d80e571ae0fc97ca731e0a56faac56f20841a (diff) | |
| download | bcm5719-llvm-c0964b60e501872e35c51db23f5fe6a6a5523091.tar.gz bcm5719-llvm-c0964b60e501872e35c51db23f5fe6a6a5523091.zip | |
Re-land the fix for PR7139.
llvm-svn: 104446
Diffstat (limited to 'clang/lib/CodeGen/CGClass.cpp')
| -rw-r--r-- | clang/lib/CodeGen/CGClass.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/CodeGen/CGClass.cpp b/clang/lib/CodeGen/CGClass.cpp index 82c72288d91..587a68beb22 100644 --- a/clang/lib/CodeGen/CGClass.cpp +++ b/clang/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); |
