diff options
author | Eli Friedman <eli.friedman@gmail.com> | 2011-12-07 01:30:11 +0000 |
---|---|---|
committer | Eli Friedman <eli.friedman@gmail.com> | 2011-12-07 01:30:11 +0000 |
commit | 26e80cdfe8933a7f804e1d05b379d5ad50119db5 (patch) | |
tree | 36fc24dfc29f34c6942c4aa05c694aba4ff9b1d7 /lib/CodeGen/CGRecordLayoutBuilder.cpp | |
parent | dcf06fa1fbb9c018e152629ef3f3fa7b1acffe7a (diff) |
Make sure we correctly zero-initialize unions containing a pointer to data member as the first field. PR11487.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@146009 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/CGRecordLayoutBuilder.cpp')
-rw-r--r-- | lib/CodeGen/CGRecordLayoutBuilder.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/CodeGen/CGRecordLayoutBuilder.cpp b/lib/CodeGen/CGRecordLayoutBuilder.cpp index 383452c79a..106ce10f51 100644 --- a/lib/CodeGen/CGRecordLayoutBuilder.cpp +++ b/lib/CodeGen/CGRecordLayoutBuilder.cpp @@ -531,6 +531,7 @@ void CGRecordLayoutBuilder::LayoutUnion(const RecordDecl *D) { CharUnits unionAlign = CharUnits::Zero(); bool hasOnlyZeroSizedBitFields = true; + bool checkedFirstFieldZeroInit = false; unsigned fieldNo = 0; for (RecordDecl::field_iterator field = D->field_begin(), @@ -542,6 +543,11 @@ void CGRecordLayoutBuilder::LayoutUnion(const RecordDecl *D) { if (!fieldType) continue; + if (field->getDeclName() && !checkedFirstFieldZeroInit) { + CheckZeroInitializable(field->getType()); + checkedFirstFieldZeroInit = true; + } + hasOnlyZeroSizedBitFields = false; CharUnits fieldAlign = CharUnits::fromQuantity( |