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

llvm-svn: 176727

2 files changed, 13 insertions, 2 deletions

diff --git a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
index d54ca31565e..c39f0062586 100644
--- a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
+++ b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
@@ -229,7 +229,7 @@ Decl *TemplateDeclInstantiator::InstantiateTypedefNameDecl(TypedefNameDecl *D,
   // tag decl, re-establish that relationship for the new typedef.
   if (const TagType *oldTagType = D->getUnderlyingType()->getAs<TagType>()) {
     TagDecl *oldTag = oldTagType->getDecl();
-    if (oldTag->getTypedefNameForAnonDecl() == D) {
+    if (oldTag->getTypedefNameForAnonDecl() == D && !Invalid) {
       TagDecl *newTag = DI->getType()->castAs<TagType>()->getDecl();
       assert(!newTag->getIdentifier() && !newTag->getTypedefNameForAnonDecl());
       newTag->setTypedefNameForAnonDecl(Typedef);
diff --git a/clang/test/SemaTemplate/instantiate-type.cpp b/clang/test/SemaTemplate/instantiate-type.cpp
index f5d02707cb1..2440a38f3e6 100644
--- a/clang/test/SemaTemplate/instantiate-type.cpp
+++ b/clang/test/SemaTemplate/instantiate-type.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fsyntax-only %s
+// RUN: %clang_cc1 -fsyntax-only -verify %s
 
 int* f(int);
 float *f(...);
@@ -15,3 +15,14 @@ X<int>::typeof_type &iptr1 = iptr0;
 
 X<int>::typeof_expr &iptr2 = iptr0;
 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;
+}