* Update to SVN 20140802 (r213510) from the gcc-4_9-branch.

git-svn-id: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-4.9@7552 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca

2 files changed, 270 insertions, 18 deletions

diff --git a/debian/changelog b/debian/changelog
index 65a92e4..d5b8d9f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
 gcc-4.9 (4.9.1-5) UNRELEASED; urgency=medium
 
-  * Update to SVN 20140731 (r213317) from the gcc-4_9-branch.
+  * Update to SVN 20140802 (r213510) from the gcc-4_9-branch.
     - Fix PR tree-optimization/61964. LP: #1347147.
   * Fix libphobos cross build.
 
- -- Matthias Klose <doko@debian.org>  Fri, 01 Aug 2014 17:20:58 +0200
+ -- Matthias Klose <doko@debian.org>  Sat, 02 Aug 2014 02:36:26 +0200
 
 gcc-4.9 (4.9.1-4) unstable; urgency=high
 
diff --git a/debian/patches/svn-updates.diff b/debian/patches/svn-updates.diff
index dd917a4..e0bbe86 100644
--- a/debian/patches/svn-updates.diff
+++ b/debian/patches/svn-updates.diff
@@ -1,10 +1,10 @@
-# DP: updates from the 4.9 branch upto 20140801 (r213487).
+# DP: updates from the 4.9 branch upto 20140802 (r213510).
 
 last_update()
 {
 	cat > ${dir}LAST_UPDATED <EOF
-Fri Aug  1 17:14:05 CEST 2014
-Fri Aug  1 15:14:05 UTC 2014 (revision 213487)
+Sat Aug  2 02:28:42 CEST 2014
+Sat Aug  2 00:28:42 UTC 2014 (revision 213510)
 EOF
 }
 
@@ -1101,7 +1101,13 @@ Index: gcc/c-family/ChangeLog
 ===================================================================
 --- a/src/gcc/c-family/ChangeLog	(.../tags/gcc_4_9_1_release)
 +++ b/src/gcc/c-family/ChangeLog	(.../branches/gcc-4_9-branch)
-@@ -1,3 +1,13 @@
+@@ -1,3 +1,19 @@
++2014-08-01  Igor Zamyatin  <igor.zamyatin@intel.com>
++
++	PR middle-end/61455
++	* array-notation-common.c (extract_array_notation_exprs): Handling
++	of DECL_EXPR added.
++
 +2014-07-17  Richard Biener  <rguenther@suse.de>
 +
 +	Backport from mainline
@@ -1115,13 +1121,76 @@ Index: gcc/c-family/ChangeLog
  2014-07-16  Release Manager
  
  	* GCC 4.9.1 released.
+Index: gcc/c-family/array-notation-common.c
+===================================================================
+--- a/src/gcc/c-family/array-notation-common.c	(.../tags/gcc_4_9_1_release)
++++ b/src/gcc/c-family/array-notation-common.c	(.../branches/gcc-4_9-branch)
+@@ -329,6 +329,14 @@
+       vec_safe_push (*array_list, node);
+       return;
+     }
++  if (TREE_CODE (node) == DECL_EXPR)
++    {
++      tree x = DECL_EXPR_DECL (node);
++      if (DECL_INITIAL (x))
++	extract_array_notation_exprs (DECL_INITIAL (x),
++				      ignore_builtin_fn,
++				      array_list);
++    }
+   else if (TREE_CODE (node) == STATEMENT_LIST)
+     {
+       tree_stmt_iterator ii_tsi;
+Index: gcc/c/ChangeLog
+===================================================================
+--- a/src/gcc/c/ChangeLog	(.../tags/gcc_4_9_1_release)
++++ b/src/gcc/c/ChangeLog	(.../branches/gcc-4_9-branch)
+@@ -1,3 +1,9 @@
++2014-08-01  Igor Zamyatin  <igor.zamyatin@intel.com>
++
++	PR middle-end/61455
++	* c-array-notation.c (expand_array_notations): Handling
++	of DECL_EXPR added.
++
+ 2014-07-16  Release Manager
+ 
+ 	* GCC 4.9.1 released.
+Index: gcc/c/c-array-notation.c
+===================================================================
+--- a/src/gcc/c/c-array-notation.c	(.../tags/gcc_4_9_1_release)
++++ b/src/gcc/c/c-array-notation.c	(.../branches/gcc-4_9-branch)
+@@ -1265,6 +1265,25 @@
+ 					 rhs_loc, rhs, TREE_TYPE (rhs));
+       }
+       break;
++    case DECL_EXPR:
++      {
++	tree x = DECL_EXPR_DECL (*tp);
++	if (DECL_INITIAL (x))
++	  {
++	    location_t loc = DECL_SOURCE_LOCATION (x);
++	    tree lhs = x;
++	    tree rhs = DECL_INITIAL (x);
++	    DECL_INITIAL (x) = NULL;
++	    tree new_modify_expr = build_modify_expr (loc, lhs,
++						      TREE_TYPE (lhs),
++						      NOP_EXPR,
++						      loc, rhs,
++						      TREE_TYPE(rhs));
++	    expand_array_notations (&new_modify_expr, walk_subtrees, NULL);
++	    *tp = new_modify_expr;
++	  }
++      }
++      break;
+     case CALL_EXPR:
+       *tp = fix_array_notation_call_expr (*tp);
+       break;
 Index: gcc/DATESTAMP
 ===================================================================
 --- a/src/gcc/DATESTAMP	(.../tags/gcc_4_9_1_release)
 +++ b/src/gcc/DATESTAMP	(.../branches/gcc-4_9-branch)
 @@ -1 +1 @@
 -20140716
-+20140801
++20140802
 Index: gcc/omp-low.c
 ===================================================================
 --- a/src/gcc/omp-low.c	(.../tags/gcc_4_9_1_release)
@@ -1167,7 +1236,12 @@ Index: gcc/ChangeLog
 ===================================================================
 --- a/src/gcc/ChangeLog	(.../tags/gcc_4_9_1_release)
 +++ b/src/gcc/ChangeLog	(.../branches/gcc-4_9-branch)
-@@ -1,3 +1,207 @@
+@@ -1,3 +1,212 @@
++2014-08-01  Vladimir Makarov  <vmakarov@redhat.com>
++
++	* lra-constraints.c (remove_inheritance_pseudos): Process
++	destination pseudo too.
++
 +2014-08-01  Thomas Preud'homme  <thomas.preudhomme@arm.com>
 +
 +	Backport from mainline
@@ -1375,7 +1449,7 @@ Index: gcc/ChangeLog
  2014-07-16  Release Manager
  
  	* GCC 4.9.1 released.
-@@ -4,14 +211,14 @@
+@@ -4,14 +216,14 @@
  
  2014-07-10  Cary Coutant  <ccoutant@google.com>
  
@@ -1394,7 +1468,7 @@ Index: gcc/ChangeLog
  
  2014-07-10  Tom G. Christensen  <tgc@jupiterrise.com>
  
-@@ -33,13 +240,13 @@
+@@ -33,13 +245,13 @@
  	PR target/61062
  	* config/arm/arm_neon.h (vtrn_s8, vtrn_s16, vtrn_u8, vtrn_u16, vtrn_p8,
  	vtrn_p16, vtrn_s32, vtrn_f32, vtrn_u32, vtrnq_s8, vtrnq_s16, vtrnq_s32,
@@ -1415,7 +1489,7 @@ Index: gcc/ChangeLog
  
  
  2014-07-09  Alan Lawrence  <alan.lawrence@arm.com>
-@@ -157,11 +364,9 @@
+@@ -157,11 +369,9 @@
  	2014-06-24  Jakub Jelinek  <jakub@redhat.com>
  
  	* gimplify.c (gimplify_scan_omp_clauses) <case OMP_CLAUSE_MAP,
@@ -1429,7 +1503,7 @@ Index: gcc/ChangeLog
  	(gimplify_adjust_omp_clauses): Likewise.
  	* omp-low.c (lower_rec_simd_input_clauses,
  	lower_rec_input_clauses, expand_omp_simd): Handle non-constant
-@@ -176,9 +381,8 @@
+@@ -176,9 +386,8 @@
  
  	2014-06-18  Jakub Jelinek  <jakub@redhat.com>
  
@@ -1441,7 +1515,7 @@ Index: gcc/ChangeLog
  	(struct gimplify_adjust_omp_clauses_data): New type.
  	(gimplify_adjust_omp_clauses_1): Adjust for data being
  	a struct gimplify_adjust_omp_clauses_data pointer instead
-@@ -196,14 +400,12 @@
+@@ -196,14 +405,12 @@
  	gimple_seq * argument to omp_finish_clause hook.
  	* omp-low.c (scan_sharing_clauses): Call scan_omp_op on
  	non-DECL_P OMP_CLAUSE_DECL if ctx->outer.
@@ -1459,7 +1533,7 @@ Index: gcc/ChangeLog
  
  	2014-06-10  Jakub Jelinek  <jakub@redhat.com>
  
-@@ -227,8 +429,7 @@
+@@ -227,8 +434,7 @@
  	OMP_CLAUSE_LINEAR_STMT.
  	* omp-low.c (lower_rec_input_clauses): Fix typo.
  	(maybe_add_implicit_barrier_cancel, lower_omp_1): Add
@@ -1469,7 +1543,7 @@ Index: gcc/ChangeLog
  
  2014-06-30  Jason Merrill  <jason@redhat.com>
  
-@@ -279,8 +480,7 @@
+@@ -279,8 +485,7 @@
  	(aarch64_sqdmlsl_lane<mode>): Likewise.
  	(aarch64_sqdmull_lane<mode>): Likewise.
  	(aarch64_sqdmull2_lane<mode>): Likewise.
@@ -1864,7 +1938,18 @@ Index: gcc/testsuite/ChangeLog
 ===================================================================
 --- a/src/gcc/testsuite/ChangeLog	(.../tags/gcc_4_9_1_release)
 +++ b/src/gcc/testsuite/ChangeLog	(.../branches/gcc-4_9-branch)
-@@ -1,3 +1,118 @@
+@@ -1,3 +1,129 @@
++2014-08-01  Igor Zamyatin  <igor.zamyatin@intel.com>
++
++	PR other/61963
++	* c-c++-common/cilk-plus/AN/pr61963.c: New test.
++
++2014-08-01  Igor Zamyatin  <igor.zamyatin@intel.com>
++
++	PR middle-end/61455
++	* c-c++-common/cilk-plus/AN/pr61455.c: New test.
++	* c-c++-common/cilk-plus/AN/pr61455-2.c: Likewise.
++
 +2014-08-01  Thomas Preud'homme  <thomas.preudhomme@arm.com>
 +
 +	Backport from mainline
@@ -1983,7 +2068,7 @@ Index: gcc/testsuite/ChangeLog
  2014-07-16  Release Manager
  
  	* GCC 4.9.1 released.
-@@ -17,7 +132,8 @@
+@@ -17,7 +143,8 @@
  	2014-06-09  Alan Lawrence  <alan.lawrence@arm.com>
  
  	PR target/61062
@@ -1993,7 +2078,7 @@ Index: gcc/testsuite/ChangeLog
  
  2014-07-08  Jakub Jelinek  <jakub@redhat.com>
  
-@@ -34,8 +150,8 @@
+@@ -34,8 +161,8 @@
  
  2014-07-08  Alan Lawrence  <alan.lawrence@arm.com>
  
@@ -2069,6 +2154,148 @@ Index: gcc/testsuite/c-c++-common/pr61741.c
 +    __builtin_abort ();
 +  return 0;
 +}
+Index: gcc/testsuite/c-c++-common/cilk-plus/AN/pr61963.c
+===================================================================
+--- a/src/gcc/testsuite/c-c++-common/cilk-plus/AN/pr61963.c	(.../tags/gcc_4_9_1_release)
++++ b/src/gcc/testsuite/c-c++-common/cilk-plus/AN/pr61963.c	(.../branches/gcc-4_9-branch)
+@@ -0,0 +1,9 @@
++/* PR other/61963 */
++/* { dg-do compile } */
++/* { dg-options "-fcilkplus" } */
++
++void f (int * int *a) /* { dg-error "expected" } */
++{
++    a[0:64] = 0; /* { dg-error "was not declared" "" { target c++ } 7 } */
++    a[0:64] = 0;
++}
+Index: gcc/testsuite/c-c++-common/cilk-plus/AN/pr61455-2.c
+===================================================================
+--- a/src/gcc/testsuite/c-c++-common/cilk-plus/AN/pr61455-2.c	(.../tags/gcc_4_9_1_release)
++++ b/src/gcc/testsuite/c-c++-common/cilk-plus/AN/pr61455-2.c	(.../branches/gcc-4_9-branch)
+@@ -0,0 +1,13 @@
++/* PR c++/61455 */
++/* { dg-options "-fcilkplus" } */
++
++int a[3] = {2, 3, 4};
++
++int main ()
++{
++  int c = 10;
++  int b = __sec_reduce_add(a[:]);
++  if (b+c != 19)
++    __builtin_abort();
++  return 0;
++}
+Index: gcc/testsuite/c-c++-common/cilk-plus/AN/pr61455.c
+===================================================================
+--- a/src/gcc/testsuite/c-c++-common/cilk-plus/AN/pr61455.c	(.../tags/gcc_4_9_1_release)
++++ b/src/gcc/testsuite/c-c++-common/cilk-plus/AN/pr61455.c	(.../branches/gcc-4_9-branch)
+@@ -0,0 +1,9 @@
++/* PR c++/61455 */
++/* { dg-do compile } */
++/* { dg-options "-fcilkplus" } */
++
++void foo ()
++{
++  int a[2];
++  int b = a[:]; /* { dg-error "cannot be scalar" } */
++}
+Index: gcc/cp/ChangeLog
+===================================================================
+--- a/src/gcc/cp/ChangeLog	(.../tags/gcc_4_9_1_release)
++++ b/src/gcc/cp/ChangeLog	(.../branches/gcc-4_9-branch)
+@@ -1,3 +1,19 @@
++2014-08-01  Igor Zamyatin  <igor.zamyatin@intel.com>
++
++	* cp-array-notation.c (expand_an_in_modify_expr): Fix the misprint
++	in error output.
++
++2014-08-01  Igor Zamyatin  <igor.zamyatin@intel.com>
++
++	PR other/61963
++	* parser.c (cp_parser_array_notation): Added check for array_type.
++
++2014-08-01  Igor Zamyatin  <igor.zamyatin@intel.com>
++
++	PR middle-end/61455
++	* cp-array-notation.c (expand_array_notation_exprs): Handling of
++	DECL_EXPR improved. Changed handling for INIT_EXPR.
++
+ 2014-07-16  Release Manager
+ 
+ 	* GCC 4.9.1 released.
+Index: gcc/cp/cp-array-notation.c
+===================================================================
+--- a/src/gcc/cp/cp-array-notation.c	(.../tags/gcc_4_9_1_release)
++++ b/src/gcc/cp/cp-array-notation.c	(.../branches/gcc-4_9-branch)
+@@ -607,7 +607,7 @@
+     
+   if (lhs_rank == 0 && rhs_rank != 0)
+     {
+-      error_at (location, "%qD cannot be scalar when %qD is not", lhs, rhs);
++      error_at (location, "%qE cannot be scalar when %qE is not", lhs, rhs);
+       return error_mark_node;
+     }
+   if (lhs_rank != 0 && rhs_rank != 0 && lhs_rank != rhs_rank)
+@@ -1147,7 +1147,6 @@
+     case PARM_DECL:
+     case NON_LVALUE_EXPR:
+     case NOP_EXPR:
+-    case INIT_EXPR:
+     case ADDR_EXPR:
+     case ARRAY_REF:
+     case BIT_FIELD_REF:
+@@ -1154,6 +1153,7 @@
+     case VECTOR_CST:
+     case COMPLEX_CST:
+       return t;
++    case INIT_EXPR:
+     case MODIFY_EXPR:
+       if (contains_array_notation_expr (t))
+ 	t = expand_an_in_modify_expr (loc, TREE_OPERAND (t, 0), NOP_EXPR, 
+@@ -1175,13 +1175,24 @@
+ 	return t;
+       }
+     case DECL_EXPR:
+-      {
+-	tree x = DECL_EXPR_DECL (t);
+-	if (t && TREE_CODE (x) != FUNCTION_DECL)
++      if (contains_array_notation_expr (t))
++	{
++	  tree x = DECL_EXPR_DECL (t);
+ 	  if (DECL_INITIAL (x))
+-	    t = expand_unary_array_notation_exprs (t);
++	    {
++	      location_t loc = DECL_SOURCE_LOCATION (x);
++	      tree lhs = x;
++	      tree rhs = DECL_INITIAL (x);
++	      DECL_INITIAL (x) = NULL;
++	      tree new_modify_expr = build_modify_expr (loc, lhs,
++							TREE_TYPE (lhs),
++							NOP_EXPR,
++							loc, rhs,
++							TREE_TYPE(rhs));
++	      t = expand_array_notation_exprs (new_modify_expr);
++	    }
++	}
+       return t;
+-      }
+     case STATEMENT_LIST:
+       {
+ 	tree_stmt_iterator i;
+Index: gcc/cp/parser.c
+===================================================================
+--- a/src/gcc/cp/parser.c	(.../tags/gcc_4_9_1_release)
++++ b/src/gcc/cp/parser.c	(.../branches/gcc-4_9-branch)
+@@ -6306,7 +6306,7 @@
+   parser->colon_corrects_to_scope_p = saved_colon_corrects;
+ 
+   if (*init_index == error_mark_node || length_index == error_mark_node
+-      || stride == error_mark_node)
++      || stride == error_mark_node || array_type == error_mark_node)
+     {
+       if (cp_lexer_peek_token (parser->lexer)->type == CPP_CLOSE_SQUARE)
+ 	cp_lexer_consume_token (parser->lexer);
 Index: gcc/tree-ssa-math-opts.c
 ===================================================================
 --- a/src/gcc/tree-ssa-math-opts.c	(.../tags/gcc_4_9_1_release)
@@ -2207,6 +2434,31 @@ Index: gcc/fortran/dependency.c
  		    this_dep = GFC_DEP_OVERLAP;
  		}
  
+Index: gcc/lra-constraints.c
+===================================================================
+--- a/src/gcc/lra-constraints.c	(.../tags/gcc_4_9_1_release)
++++ b/src/gcc/lra-constraints.c	(.../branches/gcc-4_9-branch)
+@@ -5752,6 +5752,20 @@
+ 			SUBREG_REG (SET_SRC (set)) = SET_SRC (prev_set);
+ 		      else
+ 			SET_SRC (set) = SET_SRC (prev_set);
++		      /* As we are finishing with processing the insn
++			 here, check the destination too as it might
++			 inheritance pseudo for another pseudo.  */
++		      if (bitmap_bit_p (remove_pseudos, dregno)
++			  && bitmap_bit_p (&lra_inheritance_pseudos, dregno)
++			  && (restore_regno
++			      = lra_reg_info[dregno].restore_regno) >= 0)
++			{
++			  if (GET_CODE (SET_DEST (set)) == SUBREG)
++			    SUBREG_REG (SET_DEST (set))
++			      = regno_reg_rtx[restore_regno];
++			  else
++			    SET_DEST (set) = regno_reg_rtx[restore_regno];
++			}
+ 		      lra_push_insn_and_update_insn_regno_info (curr_insn);
+ 		      lra_set_used_insn_alternative_by_uid
+ 			(INSN_UID (curr_insn), -1);
 Index: gcc/tree-ssa-copy.c
 ===================================================================
 --- a/src/gcc/tree-ssa-copy.c	(.../tags/gcc_4_9_1_release)