Fix a self-host problem caused by this over-eager assertion. I'm not sure

there's a good equivalent that's actually true, unfortunately.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@98253 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Sema/TreeTransform.h b/lib/Sema/TreeTransform.h
index 61091cdcc043d179ee3ce368b7fae3e60491146c..d6f3352266aa896101e2fd1fc26f7a6d3d25087b 100644 (file)
--- a/lib/Sema/TreeTransform.h
+++ b/lib/Sema/TreeTransform.h
@@ -2569,8 +2569,6 @@ bool TreeTransform<Derived>::
     ParmVarDecl *NewParm;
 
     if (OldParm) {
-      assert(OldParm->getTypeSourceInfo()->getType() == T->getArgType(i));
-
       NewParm = getDerived().TransformFunctionTypeParam(OldParm);
       if (!NewParm)
         return true;

diff --git a/test/SemaTemplate/instantiate-function-1.cpp b/test/SemaTemplate/instantiate-function-1.cpp
index 7b4c53cfe0d7301812ed11a14a1faedda41752dc..6e0d7115900430c1cf9fd1d31a197ab157308f2f 100644 (file)
--- a/test/SemaTemplate/instantiate-function-1.cpp
+++ b/test/SemaTemplate/instantiate-function-1.cpp
@@ -214,3 +214,9 @@ template<typename T> struct X;
 template<typename T> struct Y : public X<T> {
   Y& x() { return *this; }
 };
+
+// Make sure our assertions don't get too uppity.
+namespace test0 {
+  template <class T> class A { void foo(T array[10]); };
+  template class A<int>;
+}