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 | 19b961d5f95598837a08004d8d323e59f2be1d89 (patch) | |
| tree | 3d3cd1aca221c43baca9a23feef129994e30b233 /clang/lib/AST/ASTContext.cpp | |
| parent | 9e618ed1c907e6f05d9cb081bb36cbf33fad108b (diff) | |
| download | bcm5719-llvm-19b961d5f95598837a08004d8d323e59f2be1d89.tar.gz bcm5719-llvm-19b961d5f95598837a08004d8d323e59f2be1d89.zip | |
Merge transparent union types using member's unqualified type
llvm-svn: 120736
Diffstat (limited to 'clang/lib/AST/ASTContext.cpp')
| -rw-r--r-- | clang/lib/AST/ASTContext.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/AST/ASTContext.cpp b/clang/lib/AST/ASTContext.cpp index 42efcfbee70..6c2a77ae693 100644 --- a/clang/lib/AST/ASTContext.cpp +++ b/clang/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; |
