* decl.c (compute_array_index_type): Use size_one_node.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@200278 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index a7df33b..adff4e4 100644 (file)
--- 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..dad1e10 100644 (file)
--- 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);