aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Merrill <jason@yorick.cygnus.com>1999-03-05 11:29:22 +0000
committerJason Merrill <jason@gcc.gnu.org>1999-03-05 06:29:22 -0500
commit6fb2c05a1bd6e73412eb134f74fe867ad0e23cff (patch)
tree91bd6c7a9dfcc317c4f650897ac133cb516f88a4
parent9a5bb31788c0612eaad6a4b8d65bbc76ea2f1ac1 (diff)
downloadgcc-6fb2c05a1bd6e73412eb134f74fe867ad0e23cff.zip
gcc-6fb2c05a1bd6e73412eb134f74fe867ad0e23cff.tar.gz
gcc-6fb2c05a1bd6e73412eb134f74fe867ad0e23cff.tar.bz2
* pt.c (tsubst, case ARRAY_REF): Use tsubst_expr again.
From-SVN: r25601
-rw-r--r--gcc/cp/ChangeLog4
-rw-r--r--gcc/cp/pt.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 8653f19..2c51faa 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+1999-03-05 Jason Merrill <jason@yorick.cygnus.com>
+
+ * pt.c (tsubst, case ARRAY_REF): Use tsubst_expr again.
+
1999-03-03 Jason Merrill <jason@yorick.cygnus.com>
* class.c, decl2.c, method.c, pt.c: Add 'static' to make SunOS 4
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 71237d6..8463e5d 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -6439,8 +6439,8 @@ tsubst (t, args, complain, in_decl)
{
tree e1 = tsubst (TREE_OPERAND (t, 0), args, complain,
in_decl);
- tree e2 = tsubst (TREE_OPERAND (t, 1), args, complain,
- in_decl);
+ tree e2 = tsubst_expr (TREE_OPERAND (t, 1), args, complain,
+ in_decl);
if (e1 == error_mark_node || e2 == error_mark_node)
return error_mark_node;