summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzlaski <zlaski@138bc75d-0d04-0410-961f-82ee72b054a4>2003-04-15 00:34:11 +0000
committerzlaski <zlaski@138bc75d-0d04-0410-961f-82ee72b054a4>2003-04-15 00:34:11 +0000
commitd737e66d9252fcd3ff34c5eab1bc8db561bb47d0 (patch)
tree615565b65eaf68a4b87dcce7124241fb825d9e65
parentaf57f61736230a6009220c01a50c13a944a8ca7d (diff)
downloadgcc-d737e66d9252fcd3ff34c5eab1bc8db561bb47d0.tar.gz
2003-04-14 Ziemowit Laski <zlaski@apple.com>
* tree.c (build_cplus_array_type_1): Do not call uses_template_parms() on a NULL index_type. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@65613 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/cp/ChangeLog5
-rw-r--r--gcc/cp/tree.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index c6cec1fd780..281f83a1cd0 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-14 Ziemowit Laski <zlaski@apple.com>
+
+ * tree.c (build_cplus_array_type_1): Do not call
+ uses_template_parms() on a NULL index_type.
+
2003-04-13 Roger Sayle <roger@eyesopen.com>
* decl.c (duplicate_decls): Preserve pure and malloc attributes.
diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c
index edb4ca06a4e..ee17ceaf560 100644
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.c
@@ -516,7 +516,7 @@ build_cplus_array_type_1 (elt_type, index_type)
&& index_type && TYPE_MAX_VALUE (index_type)
&& TREE_CODE (TYPE_MAX_VALUE (index_type)) != INTEGER_CST)
|| uses_template_parms (elt_type)
- || uses_template_parms (index_type))
+ || (index_type && uses_template_parms (index_type)))
{
t = make_node (ARRAY_TYPE);
TREE_TYPE (t) = elt_type;