diff options
| author | Eli Friedman <eli.friedman@gmail.com> | 2012-01-13 03:58:31 +0000 |
|---|---|---|
| committer | Eli Friedman <eli.friedman@gmail.com> | 2012-01-13 03:58:31 +0000 |
| commit | 89e6e85f1a6c4972ece0b68950673735daec970a (patch) | |
| tree | aa8460273809fbca68068e1a94c506f2f97f03c9 /lib/CodeGen/CGRecordLayoutBuilder.cpp | |
| parent | 9ec0ef31c3bc40612e8bf47bd7d265d5e7c01ff9 (diff) | |
A base subobject type doesn't make sense for unions; don't try to compute it. Based on patch by Yin Ma. Fixes PR11751.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@148093 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/CGRecordLayoutBuilder.cpp')
| -rw-r--r-- | lib/CodeGen/CGRecordLayoutBuilder.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/CodeGen/CGRecordLayoutBuilder.cpp b/lib/CodeGen/CGRecordLayoutBuilder.cpp index 74fd794ef1..537daf9932 100644 --- a/lib/CodeGen/CGRecordLayoutBuilder.cpp +++ b/lib/CodeGen/CGRecordLayoutBuilder.cpp @@ -997,7 +997,7 @@ CGRecordLayout *CodeGenTypes::ComputeRecordLayout(const RecordDecl *D, // If we're in C++, compute the base subobject type. llvm::StructType *BaseTy = 0; - if (isa<CXXRecordDecl>(D)) { + if (isa<CXXRecordDecl>(D) && !D->isUnion()) { BaseTy = Builder.BaseSubobjectType; if (!BaseTy) BaseTy = Ty; } |