When instantiating a member function declared via a typedef, don't try

to enter the instantiated parameter declarations into the local
instantiation scope; they can't be referenced anyway. Fixes PR7022.

llvm-svn: 102914

clang/lib/Sema/SemaTemplateInstantiateDecl.cpp

@@ -1776,7 +1776,8 @@ TemplateDeclInstantiator::SubstFunctionType(FunctionDecl *D,
   if (NewTInfo != OldTInfo) {
     // Get parameters from the new type info.
     TypeLoc OldTL = OldTInfo->getTypeLoc();
-    FunctionProtoTypeLoc *OldProtoLoc = cast<FunctionProtoTypeLoc>(&OldTL);
+    if (FunctionProtoTypeLoc *OldProtoLoc
+                                  = dyn_cast<FunctionProtoTypeLoc>(&OldTL)) {
       TypeLoc NewTL = NewTInfo->getTypeLoc();
       FunctionProtoTypeLoc *NewProtoLoc = cast<FunctionProtoTypeLoc>(&NewTL);
       assert(NewProtoLoc && "Missing prototype?");
@@ -1787,12 +1788,14 @@ TemplateDeclInstantiator::SubstFunctionType(FunctionDecl *D,
                                                         OldProtoLoc->getArg(i),
                                                         NewProtoLoc->getArg(i));
       }
+    }
   } else {
     // The function type itself was not dependent and therefore no
     // substitution occurred. However, we still need to instantiate
     // the function parameters themselves.
     TypeLoc OldTL = OldTInfo->getTypeLoc();
-    FunctionProtoTypeLoc *OldProtoLoc = cast<FunctionProtoTypeLoc>(&OldTL);
+    if (FunctionProtoTypeLoc *OldProtoLoc
+                                    = dyn_cast<FunctionProtoTypeLoc>(&OldTL)) {
       for (unsigned i = 0, i_end = OldProtoLoc->getNumArgs(); i != i_end; ++i) {
         ParmVarDecl *Parm = VisitParmVarDecl(OldProtoLoc->getArg(i));
         if (!Parm)
@@ -1800,6 +1803,7 @@ TemplateDeclInstantiator::SubstFunctionType(FunctionDecl *D,
         Params.push_back(Parm);
       }
     }
+  }
   return NewTInfo;
 }
 

clang/test/SemaTemplate/instantiate-method.cpp

@@ -152,3 +152,26 @@ namespace PR6947 {
   }
 
 }
+
+namespace PR7022 {
+  template <typename > 
+  struct X1
+  {
+    typedef int state_t( );
+    state_t g ;
+  };
+
+  template <  typename U = X1<int> > struct X2
+  {
+    X2( U = U())
+    {
+    }
+  };
+
+  void m(void)
+  {
+    typedef X2<> X2_type;
+    X2_type c;
+  }
+
+}