aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Merrill <jason@yorick.cygnus.com>1998-05-07 02:18:59 +0000
committerJason Merrill <jason@gcc.gnu.org>1998-05-06 22:18:59 -0400
commit98134cade80cec3106fd9bc6aefd78b81002a1e5 (patch)
tree1969b09ae5504f561c98302b513ec0be4cbfcaf3
parent436bf9fb5bd9b2b5fb53ff94dc657f6e586efb54 (diff)
downloadgcc-98134cade80cec3106fd9bc6aefd78b81002a1e5.zip
gcc-98134cade80cec3106fd9bc6aefd78b81002a1e5.tar.gz
gcc-98134cade80cec3106fd9bc6aefd78b81002a1e5.tar.bz2
* pt.c (tsubst): Don't tsubst the type of an IDENTIFIER_NODE.
From-SVN: r19608
-rw-r--r--gcc/cp/ChangeLog4
-rw-r--r--gcc/cp/pt.c3
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index ea395ef..665b058 100644
--- 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 20602bb0..209e23e 100644
--- 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))