maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

<rdar://problem/13094134> Don't try to wire up typedef names for invalid anonymous tag declarations encountered during template instantiation. 

llvm-svn: 176727
This commit is contained in:
Douglas Gregor 2013-03-08 22:15:15 +00:00
parent 5c38272c1a
commit d831d955f6
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
View File

@ -229,7 +229,7 @@ Decl *TemplateDeclInstantiator::InstantiateTypedefNameDecl(TypedefNameDecl *D,
// tag decl, re-establish that relationship for the new typedef. // tag decl, re-establish that relationship for the new typedef.
if (const TagType *oldTagType = D->getUnderlyingType()->getAs<TagType>()) { if (const TagType *oldTagType = D->getUnderlyingType()->getAs<TagType>()) {
TagDecl *oldTag = oldTagType->getDecl(); TagDecl *oldTag = oldTagType->getDecl();
if (oldTag->getTypedefNameForAnonDecl() == D) { if (oldTag->getTypedefNameForAnonDecl() == D && !Invalid) {
TagDecl *newTag = DI->getType()->castAs<TagType>()->getDecl(); TagDecl *newTag = DI->getType()->castAs<TagType>()->getDecl();
assert(!newTag->getIdentifier() && !newTag->getTypedefNameForAnonDecl()); assert(!newTag->getIdentifier() && !newTag->getTypedefNameForAnonDecl());
newTag->setTypedefNameForAnonDecl(Typedef); newTag->setTypedefNameForAnonDecl(Typedef);

13
clang/test/SemaTemplate/instantiate-type.cpp
View File

@ -1,4 +1,4 @@
// RUN: %clang_cc1 -fsyntax-only %s // RUN: %clang_cc1 -fsyntax-only -verify %s
int* f(int); int* f(int);
float *f(...); float *f(...);
@ -15,3 +15,14 @@ X<int>::typeof_type &iptr1 = iptr0;
X<int>::typeof_expr &iptr2 = iptr0; X<int>::typeof_expr &iptr2 = iptr0;
X<float*>::typeof_expr &fptr1 = fptr0; X<float*>::typeof_expr &fptr1 = fptr0;
namespace rdar13094134 {
template <class>
class X {
typedef struct {
Y *y; // expected-error{{unknown type name 'Y'}}
} Y;
};
X<int> xi;
}