re PR middle-end/60467 (ICE with -fcilkplus)

gcc/c-family/
	PR middle-end/60467
	* cilk.c (cilk_set_spawn_marker): Remove FUNCTION_DECL
	as possible argument for Cilk_spawn.

gcc/testsuite/
	PR middle-end/60467
	* c-c++-common/cilk-plus/CK/invalid_spawns.c: Add new invalid
	case to check.

From-SVN: r209337

diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 34354a31e1e41e04364c01f8815198f49896c052..f510bcc66e3c5a17bbdce977a541e0bf7237c5ba 100644 (file)
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,9 @@
+2014-04-12  Igor Zamyatin  <igor.zamyatin@intel.com>
+
+       PR middle-end/60467
+       * cilk.c (cilk_set_spawn_marker): Remove FUNCTION_DECL
+       as possible argument for Cilk_spawn.
+
 2014-04-11  Tobias Burnus  <burnus@net-b.de>
 
        PR c/60194

diff --git a/gcc/c-family/cilk.c b/gcc/c-family/cilk.c
index 6a7bf4f1efa2f626815937e1e73b81c9bd22f7a4..bf549ad1791a45d2c7e1abf182b930f7e71994b1 100644 (file)
--- a/gcc/c-family/cilk.c
+++ b/gcc/c-family/cilk.c
@@ -99,7 +99,6 @@ cilk_set_spawn_marker (location_t loc, tree fcall)
        it.  */
     return false; 
   else if (TREE_CODE (fcall) != CALL_EXPR
-          && TREE_CODE (fcall) != FUNCTION_DECL
           /* In C++, TARGET_EXPR is generated when we have an overloaded
              '=' operator.  */
           && TREE_CODE (fcall) != TARGET_EXPR)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0639000234438ebba78e21b2879eadfcac66b64e..0af82c08c6aa51e7b4c0223c8407d5b449b7b2f6 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2014-04-12  Igor Zamyatin  <igor.zamyatin@intel.com>
+
+       PR middle-end/60467
+       * c-c++-common/cilk-plus/CK/invalid_spawns.c: Add new invalid
+       case to check.
+
 2014-04-12  Igor Zamyatin  <igor.zamyatin@intel.com>
 
        PR middle-end/60469

diff --git a/gcc/testsuite/c-c++-common/cilk-plus/CK/invalid_spawns.c b/gcc/testsuite/c-c++-common/cilk-plus/CK/invalid_spawns.c
index ba9e6193627ebe7438f612130430438e1b83f210..5b43be76010b3674a54c29c18ace7f21e29d4d9d 100644 (file)
--- a/gcc/testsuite/c-c++-common/cilk-plus/CK/invalid_spawns.c
+++ b/gcc/testsuite/c-c++-common/cilk-plus/CK/invalid_spawns.c
@@ -8,6 +8,7 @@ int main (void)
 {
   int x; 
 
+  _Cilk_spawn foo; /* { dg-error "only function calls can be spawned" } */
   _Cilk_spawn x; /* { dg-error "only function calls can be spawned" } */
   return x;
 }