aboutsummaryrefslogtreecommitdiff
path: root/gcc/gimplify.c
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2017-03-22 19:45:48 +0100
committerJakub Jelinek <jakub@gcc.gnu.org>2017-03-22 19:45:48 +0100
commit68ed2ba0a7d60275ac044a4cb50b33eb33fbb813 (patch)
tree1e4f17b8856d8dc6d804ba411cf9c40568e61ca9 /gcc/gimplify.c
parent0e2468e0ca0ad2e7adc0098f6a4061be7475fdc1 (diff)
downloadgcc-68ed2ba0a7d60275ac044a4cb50b33eb33fbb813.zip
gcc-68ed2ba0a7d60275ac044a4cb50b33eb33fbb813.tar.gz
gcc-68ed2ba0a7d60275ac044a4cb50b33eb33fbb813.tar.bz2
re PR c++/80129 (wrong code with ternary struct assignment to const)
PR c++/80129 * gimplify.c (gimplify_modify_expr_rhs) <case COND_EXPR>: Clear TREE_READONLY on result if writing it more than once. * g++.dg/torture/pr80129.C: New test. From-SVN: r246401
Diffstat (limited to 'gcc/gimplify.c')
-rw-r--r--gcc/gimplify.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/gcc/gimplify.c b/gcc/gimplify.c
index 5658d0a..f90ae94 100644
--- a/gcc/gimplify.c
+++ b/gcc/gimplify.c
@@ -5098,6 +5098,14 @@ gimplify_modify_expr_rhs (tree *expr_p, tree *from_p, tree *to_p,
if (ret != GS_ERROR)
ret = GS_OK;
+ /* If we are going to write RESULT more than once, clear
+ TREE_READONLY flag, otherwise we might incorrectly promote
+ the variable to static const and initialize it at compile
+ time in one of the branches. */
+ if (VAR_P (result)
+ && TREE_TYPE (TREE_OPERAND (cond, 1)) != void_type_node
+ && TREE_TYPE (TREE_OPERAND (cond, 2)) != void_type_node)
+ TREE_READONLY (result) = 0;
if (TREE_TYPE (TREE_OPERAND (cond, 1)) != void_type_node)
TREE_OPERAND (cond, 1)
= build2 (code, void_type_node, result,