From a1ceb6041e32e5ab4b0c38dc5b52fe9d82948719 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Wed, 17 Jun 2015 20:11:42 +0200 Subject: [PATCH] re PR middle-end/66429 (ICE in expand_GOMP_SIMD_LAST_LANE) PR middle-end/66429 * omp-low.c (expand_omp_taskreg, expand_omp_target): Use child_cfun instead of DECL_STRUCT_FUNCTION (child_fn). Or in has_simduid_loops and has_force_vectorize_loops flags from cfun into child_cfun. (expand_omp_simd): For broken loop, set cfun->has_simduid_loops if simduid is non-NULL. * tree-pass.h (make_pass_simduid_cleanup): New prototype. * passes.def (pass_simduid_cleanup): Add new pass after loop passes. * tree-vectorizer.c (adjust_simduid_builtins): Remove one unnecessary indirection from htab argument's type. (shrink_simd_arrays): New function. (vectorize_loops): Use it. Adjust adjust_simduid_builtins caller. Don't call adjust_simduid_builtins if there are no loops. (pass_data_simduid_cleanup, pass_simduid_cleanup): New variables. (pass_simduid_cleanup::execute): New method. (make_pass_simduid_cleanup): New function. From-SVN: r224571 --- gcc/ChangeLog | 4 ++-- gcc/omp-low.c | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 8f92fecf5af..919a6216ee0 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,8 +1,8 @@ 2015-06-17 Jakub Jelinek PR middle-end/66429 - * omp-low.c (expand_omp_taskreg): Use child_cfun instead of - DECL_STRUCT_FUNCTION (child_fn). Or in has_simduid_loops + * omp-low.c (expand_omp_taskreg, expand_omp_target): Use child_cfun + instead of DECL_STRUCT_FUNCTION (child_fn). Or in has_simduid_loops and has_force_vectorize_loops flags from cfun into child_cfun. (expand_omp_simd): For broken loop, set cfun->has_simduid_loops diff --git a/gcc/omp-low.c b/gcc/omp-low.c index 6325b826010..415a2c88a0b 100644 --- a/gcc/omp-low.c +++ b/gcc/omp-low.c @@ -8960,7 +8960,9 @@ expand_omp_target (struct omp_region *region) vec_safe_truncate (child_cfun->local_decls, dstidx); /* Inform the callgraph about the new function. */ - DECL_STRUCT_FUNCTION (child_fn)->curr_properties = cfun->curr_properties; + child_cfun->curr_properties = cfun->curr_properties; + child_cfun->has_simduid_loops |= cfun->has_simduid_loops; + child_cfun->has_force_vectorize_loops |= cfun->has_force_vectorize_loops; cgraph_node *node = cgraph_node::get_create (child_fn); node->parallelized_function = 1; cgraph_node::add_new_function (child_fn, true); -- 2.30.2