diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index e13653c4a2449bfec4ae1617e6c65b87d66e2e03..6e059778988fb5c5a3c617db78a2cca72c6a053e 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-15  Mark Mitchell  <mark@codesourcery.com>
+
+	PR c++/22204
+	* repo.c (repo_emit_p): Robustify.
+
 2005-07-14  Daniel Berlin  <dberlin@dberlin.org>
 
 	Fix PR c++/22452
diff --git a/gcc/cp/repo.c b/gcc/cp/repo.c
index 725dbb315f1f54e22eaa015543752b6a99092291..b3d327d4b00e8c2cd62f4394eec38689b8699fb8 100644
--- a/gcc/cp/repo.c
+++ b/gcc/cp/repo.c
@@ -285,7 +285,8 @@ repo_emit_p (tree decl)
       else if (DECL_TINFO_P (decl))
 	type = TREE_TYPE (DECL_NAME (decl));
       if (!DECL_TEMPLATE_INSTANTIATION (decl)
-	  && !CLASSTYPE_TEMPLATE_INSTANTIATION (type))
+	  && (!TYPE_LANG_SPECIFIC (type)
+	      || !CLASSTYPE_TEMPLATE_INSTANTIATION (type)))
 	return 2;
     }
   else if (!DECL_TEMPLATE_INSTANTIATION (decl))
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 61d87257fef22c4d9fa892d8515e42fe9c9cf5b2..30bde128ae4a129413fc8696a2de3d1cc436368d 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-15  Mark Mitchell  <mark@codesourcery.com>
+
+	PR c++/22204
+	* g++.dg/rtti/repo1.C: New test.
+
 2005-07-15  Andrew Pinski  <pinskia@physics.uc.edu>
 
 	PR middle-end/22398
diff --git a/gcc/testsuite/g++.dg/rtti/repo1.C b/gcc/testsuite/g++.dg/rtti/repo1.C
new file mode 100644
index 0000000000000000000000000000000000000000..279da2b43a8ba0b7d81b4ad4712ad8c3d5de4790
--- /dev/null
+++ b/gcc/testsuite/g++.dg/rtti/repo1.C
@@ -0,0 +1,15 @@
+// PR c++/22204
+// { dg-options "-frepo" }
+
+#include <typeinfo>
+template<int>
+struct function1
+{
+  function1()
+  {
+    typeid(int[100]);
+  }
+};
+function1<1> b;
+
+int main () {}