* pt.c (tsubst): Don't tsubst the type of an IDENTIFIER_NODE.

From-SVN: r19608

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index ea395efa322ad35e65dedff8974bf844c2129546..665b05866247e590665ff7fe7c191579f2755db1 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+Wed May  6 19:27:09 1998  Jason Merrill  <jason@yorick.cygnus.com>
+
+       * pt.c (tsubst): Don't tsubst the type of an IDENTIFIER_NODE.
+
 Wed May  6 16:49:48 1998  Jim Wilson  <wilson@cygnus.com>
 
        * Makefile.in (call.o, class.o, decl.o, decl2.o, errfn.o, error.o,

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 20602bb08452d7dda987ed822a5b8335e79411cd..209e23e22c3af28453aeb8f4b9c3288880482d66 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -3860,7 +3860,8 @@ tsubst (t, args, in_decl)
     my_friendly_abort (42);
   if (type && TREE_CODE (t) != FUNCTION_DECL
       && TREE_CODE (t) != TYPENAME_TYPE
-      && TREE_CODE (t) != TEMPLATE_DECL)
+      && TREE_CODE (t) != TEMPLATE_DECL
+      && TREE_CODE (t) != IDENTIFIER_NODE)
     type = tsubst (type, args, in_decl);
 
   switch (TREE_CODE (t))