re PR middle-end/60469 (simple cilk plus program ICEs)

gcc/c/
	PR middle-end/60469
	* c-array-notation.c (fix_builtin_array_notation_fn): Use
	create_tmp_var instead build_decl for creating temps.
	(build_array_notation_expr): Likewise.
	(fix_conditional_array_notations_1): Likewise.
	(fix_array_notation_expr): Likewise.
	(fix_array_notation_call_expr): Likewise.

gcc/testsuite/
	PR middle-end/60469
	* c-c++-common/cilk-plus/CK/pr60469.c: New test.

From-SVN: r209336

diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index 6b819e9964d24eab1725bb4629db4fff18e4f8c3..bacfbe36702f3edb07214b00aeca6123c1228b14 100644 (file)
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -1,3 +1,13 @@
+2014-04-12  Igor Zamyatin  <igor.zamyatin@intel.com>
+
+       PR middle-end/60469
+       * c-array-notation.c (fix_builtin_array_notation_fn): Use
+       create_tmp_var instead build_decl for creating temps.
+       (build_array_notation_expr): Likewise.
+       (fix_conditional_array_notations_1): Likewise.
+       (fix_array_notation_expr): Likewise.
+       (fix_array_notation_call_expr): Likewise.
+
 2014-03-28  Jakub Jelinek  <jakub@redhat.com>
 
        PR c++/60689

diff --git a/gcc/c/c-array-notation.c b/gcc/c/c-array-notation.c
index 6a5631c3b6f530b134f1364734d74cd7111f79aa..0ac6ba8e119c523c50828e2562d26074dec2aab1 100644 (file)
--- a/gcc/c/c-array-notation.c
+++ b/gcc/c/c-array-notation.c
@@ -70,6 +70,7 @@
 #include "coretypes.h"
 #include "tree.h"
 #include "c-tree.h"
+#include "gimple-expr.h"
 #include "tree-iterator.h"
 #include "opts.h"
 #include "c-family/c-common.h"
@@ -282,8 +283,7 @@ fix_builtin_array_notation_fn (tree an_builtin_fn, tree *new_var)
 
   for (ii = 0; ii < rank; ii++)
     {
-      an_loop_info[ii].var = build_decl (location, VAR_DECL, NULL_TREE,
-                                 integer_type_node);
+      an_loop_info[ii].var = create_tmp_var (integer_type_node, NULL);
       an_loop_info[ii].ind_init =
        build_modify_expr (location, an_loop_info[ii].var,
                           TREE_TYPE (an_loop_info[ii].var), NOP_EXPR,
@@ -781,8 +781,8 @@ build_array_notation_expr (location_t location, tree lhs, tree lhs_origtype,
   for (ii = 0; ii < lhs_rank; ii++)
     if (lhs_an_info[0][ii].is_vector)
       {
-       lhs_an_loop_info[ii].var = build_decl (location, VAR_DECL, NULL_TREE,
-                                              integer_type_node);
+       lhs_an_loop_info[ii].var = create_tmp_var (integer_type_node,
+                                                  NULL);
        lhs_an_loop_info[ii].ind_init = build_modify_expr
          (location, lhs_an_loop_info[ii].var,
           TREE_TYPE (lhs_an_loop_info[ii].var), NOP_EXPR,
@@ -793,8 +793,8 @@ build_array_notation_expr (location_t location, tree lhs, tree lhs_origtype,
     {
       /* When we have a polynomial, we assume that the indices are of type 
         integer.  */
-      rhs_an_loop_info[ii].var = build_decl (location, VAR_DECL, NULL_TREE,
-                                            integer_type_node);
+      rhs_an_loop_info[ii].var = create_tmp_var (integer_type_node,
+                                                NULL);
       rhs_an_loop_info[ii].ind_init = build_modify_expr
        (location, rhs_an_loop_info[ii].var,
         TREE_TYPE (rhs_an_loop_info[ii].var), NOP_EXPR,
@@ -970,8 +970,7 @@ fix_conditional_array_notations_1 (tree stmt)
   cilkplus_extract_an_triplets (array_list, list_size, rank, &an_info);
   for (ii = 0; ii < rank; ii++)
     {
-      an_loop_info[ii].var = build_decl (location, VAR_DECL, NULL_TREE,
-                                        integer_type_node);
+      an_loop_info[ii].var = create_tmp_var (integer_type_node, NULL);
       an_loop_info[ii].ind_init =
        build_modify_expr (location, an_loop_info[ii].var,
                           TREE_TYPE (an_loop_info[ii].var), NOP_EXPR,
@@ -1067,8 +1066,7 @@ fix_array_notation_expr (location_t location, enum tree_code code,
   loop_init = push_stmt_list ();
   for (ii = 0; ii < rank; ii++)
     {
-      an_loop_info[ii].var = build_decl (location, VAR_DECL, NULL_TREE,
-                                        integer_type_node);
+      an_loop_info[ii].var = create_tmp_var (integer_type_node, NULL);
       an_loop_info[ii].ind_init =
        build_modify_expr (location, an_loop_info[ii].var,
                           TREE_TYPE (an_loop_info[ii].var), NOP_EXPR,
@@ -1163,8 +1161,7 @@ fix_array_notation_call_expr (tree arg)
     }
   for (ii = 0; ii < rank; ii++)
     {
-      an_loop_info[ii].var = build_decl (location, VAR_DECL, NULL_TREE,
-                                        integer_type_node);
+      an_loop_info[ii].var = create_tmp_var (integer_type_node, NULL);
       an_loop_info[ii].ind_init =
        build_modify_expr (location, an_loop_info[ii].var,
                           TREE_TYPE (an_loop_info[ii].var), NOP_EXPR, location,

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 83062f87da8d744ed7ade4b91c326b5aeabceb72..0639000234438ebba78e21b2879eadfcac66b64e 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-04-12  Igor Zamyatin  <igor.zamyatin@intel.com>
+
+       PR middle-end/60469
+       * c-c++-common/cilk-plus/CK/pr60469.c: New test.
+
 2014-04-12  Richard Sandiford  <rdsandiford@googlemail.com>
 
        * gcc.target/mips/umips-store16-1.c: New test.

diff --git a/gcc/testsuite/c-c++-common/cilk-plus/CK/pr60469.c b/gcc/testsuite/c-c++-common/cilk-plus/CK/pr60469.c
new file mode 100644 (file)
index 0000000..ca0cf7f
--- /dev/null
+++ b/gcc/testsuite/c-c++-common/cilk-plus/CK/pr60469.c
@@ -0,0 +1,15 @@
+/* PR middle-end/60469 */
+/* { dg-do compile } */
+/* { dg-options "-fcilkplus" } */
+
+void foo() {}
+
+#define ALEN 1024
+
+int main(int argc, char* argv[])
+{
+  int b[ALEN];
+  b[:] = 100;
+  _Cilk_spawn foo();
+  return 0;
+}