diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2018-01-16 16:18:24 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2018-01-16 16:18:24 +0100 |
| commit | 47c268c4b27782717fbccec5019e0cd97d005afb (patch) | |
| tree | 5c745cb7d58bf3c4f7d5f54233cd961caf3125d2 | |
| parent | fb2f98bb6c5e016514bc3b93f8f1550e39e7d28f (diff) | |
| download | gcc-47c268c4b27782717fbccec5019e0cd97d005afb.zip gcc-47c268c4b27782717fbccec5019e0cd97d005afb.tar.gz gcc-47c268c4b27782717fbccec5019e0cd97d005afb.tar.bz2 | |
re PR libgomp/83590 ([nvptx] openacc reduction C regressions)
PR libgomp/83590
* gimplify.c (gimplify_one_sizepos): For is_gimple_constant (expr)
return early, inline manually is_gimple_sizepos. Make sure if we
call gimplify_expr we don't end up with a gimple constant.
* tree.c (variably_modified_type_p): Don't return true for
is_gimple_constant (_t). Inline manually is_gimple_sizepos.
* gimplify.h (is_gimple_sizepos): Remove.
Co-Authored-By: Richard Biener <rguenther@suse.de>
From-SVN: r256748
| -rw-r--r-- | gcc/ChangeLog | 11 | ||||
| -rw-r--r-- | gcc/gimplify.c | 11 | ||||
| -rw-r--r-- | gcc/gimplify.h | 19 | ||||
| -rw-r--r-- | gcc/tree.c | 5 |
4 files changed, 24 insertions, 22 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 979f5ae..343aefd 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,14 @@ +2018-01-16 Jakub Jelinek <jakub@redhat.com> + Richard Biener <rguenth@suse.de> + + PR libgomp/83590 + * gimplify.c (gimplify_one_sizepos): For is_gimple_constant (expr) + return early, inline manually is_gimple_sizepos. Make sure if we + call gimplify_expr we don't end up with a gimple constant. + * tree.c (variably_modified_type_p): Don't return true for + is_gimple_constant (_t). Inline manually is_gimple_sizepos. + * gimplify.h (is_gimple_sizepos): Remove. + 2018-01-16 Richard Sandiford <richard.sandiford@linaro.org> PR tree-optimization/83857 diff --git a/gcc/gimplify.c b/gcc/gimplify.c index fd0d21e..8e86c338 100644 --- a/gcc/gimplify.c +++ b/gcc/gimplify.c @@ -12562,7 +12562,10 @@ gimplify_one_sizepos (tree *expr_p, gimple_seq *stmt_p) a VAR_DECL. If it's a VAR_DECL from another function, the gimplifier will want to replace it with a new variable, but that will cause problems if this type is from outside the function. It's OK to have that here. */ - if (is_gimple_sizepos (expr)) + if (expr == NULL_TREE + || is_gimple_constant (expr) + || TREE_CODE (expr) == VAR_DECL + || CONTAINS_PLACEHOLDER_P (expr)) return; *expr_p = unshare_expr (expr); @@ -12570,6 +12573,12 @@ gimplify_one_sizepos (tree *expr_p, gimple_seq *stmt_p) /* SSA names in decl/type fields are a bad idea - they'll get reclaimed if the def vanishes. */ gimplify_expr (expr_p, stmt_p, NULL, is_gimple_val, fb_rvalue, false); + + /* If expr wasn't already is_gimple_sizepos or is_gimple_constant from the + FE, ensure that it is a VAR_DECL, otherwise we might handle some decls + as gimplify_vla_decl even when they would have all sizes INTEGER_CSTs. */ + if (is_gimple_constant (*expr_p)) + *expr_p = get_initialized_tmp_var (*expr_p, stmt_p, NULL, false); } /* Gimplify the body of statements of FNDECL and return a GIMPLE_BIND node diff --git a/gcc/gimplify.h b/gcc/gimplify.h index 2b70d32..dd0e4c0 100644 --- a/gcc/gimplify.h +++ b/gcc/gimplify.h @@ -85,23 +85,4 @@ extern enum gimplify_status gimplify_va_arg_expr (tree *, gimple_seq *, gimple_seq *); gimple *gimplify_assign (tree, tree, gimple_seq *); -/* Return true if gimplify_one_sizepos doesn't need to gimplify - expr (when in TYPE_SIZE{,_UNIT} and similar type/decl size/bitsize - fields). */ - -static inline bool -is_gimple_sizepos (tree expr) -{ - /* gimplify_one_sizepos doesn't need to do anything if the value isn't there, - is constant, or contains A PLACEHOLDER_EXPR. We also don't want to do - anything if it's already a VAR_DECL. If it's a VAR_DECL from another - function, the gimplifier will want to replace it with a new variable, - but that will cause problems if this type is from outside the function. - It's OK to have that here. */ - return (expr == NULL_TREE - || TREE_CODE (expr) == INTEGER_CST - || TREE_CODE (expr) == VAR_DECL - || CONTAINS_PLACEHOLDER_P (expr)); -} - #endif /* GCC_GIMPLIFY_H */ @@ -8825,11 +8825,12 @@ variably_modified_type_p (tree type, tree fn) do { tree _t = (T); \ if (_t != NULL_TREE \ && _t != error_mark_node \ - && TREE_CODE (_t) != INTEGER_CST \ + && !CONSTANT_CLASS_P (_t) \ && TREE_CODE (_t) != PLACEHOLDER_EXPR \ && (!fn \ || (!TYPE_SIZES_GIMPLIFIED (type) \ - && !is_gimple_sizepos (_t)) \ + && (TREE_CODE (_t) != VAR_DECL \ + && !CONTAINS_PLACEHOLDER_P (_t))) \ || walk_tree (&_t, find_var_from_fn, fn, NULL))) \ return true; } while (0) |