diff options
| author | Peter Collingbourne <peter@pcc.me.uk> | 2010-12-02 21:00:06 +0000 |
|---|---|---|
| committer | Peter Collingbourne <peter@pcc.me.uk> | 2010-12-02 21:00:06 +0000 |
| commit | f91d7572ee7fa6f2926c8e7e816039a1154a59f8 (patch) | |
| tree | 51c39b7a8b3950a3cf01e9a7329c5bb19c8c125b /lib/AST/ASTContext.cpp | |
| parent | 7966297a70996977f167a8676568f02f4283bdd6 (diff) | |
Merge transparent union types using member's unqualified type
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@120736 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/AST/ASTContext.cpp')
| -rw-r--r-- | lib/AST/ASTContext.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp index 42efcfbee7..6c2a77ae69 100644 --- a/lib/AST/ASTContext.cpp +++ b/lib/AST/ASTContext.cpp @@ -4736,7 +4736,7 @@ QualType ASTContext::mergeTransparentUnionType(QualType T, QualType SubType, if (UD->hasAttr<TransparentUnionAttr>()) { for (RecordDecl::field_iterator it = UD->field_begin(), itend = UD->field_end(); it != itend; ++it) { - QualType ET = getCanonicalParamType(it->getType()); + QualType ET = it->getType().getUnqualifiedType(); QualType MT = mergeTypes(ET, SubType, OfBlockPointer, Unqualified); if (!MT.isNull()) return MT; |