typeck2.c (split_nonconstant_init_1): Fix num_split_elts handling for RANGE_ARRAY case.

* typeck2.c (split_nonconstant_init_1): Fix num_split_elts handling for RANGE_ARRAY case. From-SVN: r207050

typeck2.c (split_nonconstant_init_1): Fix num_split_elts handling for RANGE_ARRAY case.
* typeck2.c (split_nonconstant_init_1): Fix num_split_elts handling for RANGE_ARRAY case. From-SVN: r207050
2cbf3dd7 · Jakub Jelinek · Jason Merrill · c51f5910 · 2cbf3dd7 · 2cbf3dd7
Commit 2cbf3dd7 authored Jan 24, 2014 by Jakub Jelinek Committed by Jason Merrill Jan 24, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

gcc/cp/ChangeLog
+5 -0

gcc/cp/typeck2.c
+2 -0

No files found.
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
+2014-01-24  Jakub Jelinek  <jakub@redhat.com>
+
+	* typeck2.c (split_nonconstant_init_1): Fix num_split_elts
+	handling for RANGE_ARRAY case.
+
 2014-01-24  Paolo Carlini  <paolo.carlini@oracle.com>

 	PR c++/57524

--- a/gcc/cp/typeck2.c
+++ b/gcc/cp/typeck2.c
@@ -643,6 +643,8 @@ split_nonconstant_init_1 (tree dest, tree init)
 		  code = build_vec_init (sub, max, value, false, 0,
 					 tf_warning_or_error);
 		  add_stmt (code);
+		  if (tree_fits_shwi_p (max))
+		    num_split_elts += tree_to_shwi (max);
 		}
 	      else
 		{