diff options
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/lib/AST/ASTContext.cpp | 2 | ||||
| -rw-r--r-- | clang/test/Sema/transparent-union.c | 4 |
2 files changed, 5 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; diff --git a/clang/test/Sema/transparent-union.c b/clang/test/Sema/transparent-union.c index a825ed8a2e4..ab1ba1867f4 100644 --- a/clang/test/Sema/transparent-union.c +++ b/clang/test/Sema/transparent-union.c @@ -3,6 +3,7 @@ typedef union { int *ip; float *fp; long *__restrict rlp; + void *vpa[1]; } TU __attribute__((transparent_union)); void f(TU); // expected-note{{passing argument to parameter here}} @@ -39,6 +40,9 @@ void fsp(short *s) {} // expected-error{{conflicting types}} void fi(TU); // expected-note{{previous declaration is here}} void fi(int i) {} // expected-error{{conflicting types}} +void fvpp(TU); // expected-note{{previous declaration is here}} +void fvpp(void **v) {} // expected-error{{conflicting types}} + /* FIXME: we'd like to just use an "int" here and align it differently from the normal "int", but if we do so we lose the alignment information from the typedef within the compiler. */ |
