--- a/gcc/c-family/c-gimplify.c	Fri Oct 27 22:46:09 2017 +0900
+++ b/gcc/c-family/c-gimplify.c	Thu Oct 25 07:37:49 2018 +0900
@@ -2,7 +2,7 @@
    by the C-based front ends.  The structure of gimplified, or
    language-independent, trees is dictated by the grammar described in this
    file.
-   Copyright (C) 2002-2017 Free Software Foundation, Inc.
+   Copyright (C) 2002-2018 Free Software Foundation, Inc.
    Lowering of expressions contributed by Sebastian Pop <s.pop@laposte.net>
    Re-written to support lowering of whole function trees, documentation
    and miscellaneous cleanups by Diego Novillo <dnovillo@redhat.com>
@@ -36,7 +36,6 @@
 #include "gimplify.h"
 #include "langhooks.h"
 #include "dumpfile.h"
-#include "cilk.h"
 #include "c-ubsan.h"
 
 /*  The gimplification pass converts the language-dependent trees
@@ -246,7 +245,9 @@
 				    unsigned_type_node)
 	    && !types_compatible_p (TYPE_MAIN_VARIANT (TREE_TYPE (*op1_p)),
 				    integer_type_node))
-	  *op1_p = convert (unsigned_type_node, *op1_p);
+	  /* Make sure to unshare the result, tree sharing is invalid
+	     during gimplification.  */
+	  *op1_p = unshare_expr (convert (unsigned_type_node, *op1_p));
 	break;
       }
 
@@ -277,25 +278,6 @@
 	break;
       }
 
-    case CILK_SPAWN_STMT:
-      gcc_assert(fn_contains_cilk_spawn_p (cfun)
-		 && cilk_detect_spawn_and_unwrap (expr_p));
-
-      if (!seen_error ())
-        return (enum gimplify_status) gimplify_cilk_spawn (expr_p);
-      return GS_ERROR;
-
-    case MODIFY_EXPR:
-    case INIT_EXPR:
-    case CALL_EXPR:
-      if (fn_contains_cilk_spawn_p (cfun)
-	  && cilk_detect_spawn_and_unwrap (expr_p)
-	  /* If an error is found, the spawn wrapper is removed and the
-	     original expression (MODIFY/INIT/CALL_EXPR) is processes as
-	     it is supposed to be.  */
-	  && !seen_error ())
-        return (enum gimplify_status) gimplify_cilk_spawn (expr_p);
-
     default:;
     }