[cfe-commits] r98253 - in /cfe/trunk: lib/Sema/TreeTransform.h test/SemaTemplate/instantiate-function-1.cpp

[John McCall]

Author: rjmccall
Date: Thu Mar 11 03:33:17 2010
New Revision: 98253

URL: http://llvm.org/viewvc/llvm-project?rev=98253&view=rev
Log:
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.


Modified:
    cfe/trunk/lib/Sema/TreeTransform.h
    cfe/trunk/test/SemaTemplate/instantiate-function-1.cpp

Modified: cfe/trunk/lib/Sema/TreeTransform.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/TreeTransform.h?rev=98253&r1=98252&r2=98253&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/TreeTransform.h (original)
+++ cfe/trunk/lib/Sema/TreeTransform.h Thu Mar 11 03:33:17 2010
@@ -2569,8 +2569,6 @@
     ParmVarDecl *NewParm;
 
     if (OldParm) {
-      assert(OldParm->getTypeSourceInfo()->getType() == T->getArgType(i));
-
       NewParm = getDerived().TransformFunctionTypeParam(OldParm);
       if (!NewParm)
         return true;

Modified: cfe/trunk/test/SemaTemplate/instantiate-function-1.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaTemplate/instantiate-function-1.cpp?rev=98253&r1=98252&r2=98253&view=diff
==============================================================================
--- cfe/trunk/test/SemaTemplate/instantiate-function-1.cpp (original)
+++ cfe/trunk/test/SemaTemplate/instantiate-function-1.cpp Thu Mar 11 03:33:17 2010
@@ -214,3 +214,9 @@
 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>;
+}