aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2013-06-20 20:28:23 -0400
committerJason Merrill <jason@gcc.gnu.org>2013-06-20 20:28:23 -0400
commit8fc95c057c13a936806315026521b505cdbb28c9 (patch)
treeecdfa50ca49a2cb9dd6b32164bc49dcf7764aa1d /gcc
parent0daa6ac0ca88d9881b191c43b7637acbb161e787 (diff)
downloadgcc-8fc95c057c13a936806315026521b505cdbb28c9.zip
gcc-8fc95c057c13a936806315026521b505cdbb28c9.tar.gz
gcc-8fc95c057c13a936806315026521b505cdbb28c9.tar.bz2
* decl.c (compute_array_index_type): Use size_one_node.
From-SVN: r200278
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cp/ChangeLog2
-rw-r--r--gcc/cp/decl.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index a7df33b..adff4e4 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,7 @@
2013-06-20 Jason Merrill <jason@redhat.com>
+ * decl.c (compute_array_index_type): Use size_one_node.
+
* pt.c (process_partial_specialization): Build a TEMPLATE_DECL for
a partial specialization.
(tsubst_decl): Don't clobber CLASSTYPE_TI_TEMPLATE of a partial
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 9eb1d12..dad1e102 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -8241,7 +8241,7 @@ compute_array_index_type (tree name, tree size, tsubst_flags_t complain)
constant. Just build the index type and mark that it requires
structural equality checks. */
itype = build_index_type (build_min (MINUS_EXPR, sizetype,
- size, integer_one_node));
+ size, size_one_node));
TYPE_DEPENDENT_P (itype) = 1;
TYPE_DEPENDENT_P_VALID (itype) = 1;
SET_TYPE_STRUCTURAL_EQUALITY (itype);