diff options
| author | Richard Biener <rguenther@suse.de> | 2014-06-05 17:34:48 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2014-06-05 17:34:48 +0000 |
| commit | 406d36639601910fe29b23e2ce3e08ffc06ccde7 (patch) | |
| tree | c27d51fa4c3f27fb65af1ff9e5f82b3521ba6ede /gcc | |
| parent | da4e26be993775444e460edd68c88a1ae6a6a16e (diff) | |
| download | gcc-406d36639601910fe29b23e2ce3e08ffc06ccde7.zip gcc-406d36639601910fe29b23e2ce3e08ffc06ccde7.tar.gz gcc-406d36639601910fe29b23e2ce3e08ffc06ccde7.tar.bz2 | |
re PR c++/56961 (stack overflow in gimplifier with volatile field)
/cp
2014-06-05 Richard Biener <rguenther@suse.de>
Paolo Carlini <paolo.carlini@oracle.com>
PR c++/56961
* cp-gimplify.c (cp_gimplify_expr, [MODIFY_EXPR]): Rework
handling of empty classes.
/testsuite
2014-06-05 Richard Biener <rguenther@suse.de>
Paolo Carlini <paolo.carlini@oracle.com>
PR c++/56961
* g++.dg/parse/pr56961.C: New.
Co-Authored-By: Paolo Carlini <paolo.carlini@oracle.com>
From-SVN: r211286
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/cp/cp-gimplify.c | 17 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/parse/pr56961.C | 16 |
4 files changed, 34 insertions, 12 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 1248ea1..45e1012 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,10 @@ +2014-06-05 Richard Biener <rguenther@suse.de> + Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/56961 + * cp-gimplify.c (cp_gimplify_expr, [MODIFY_EXPR]): Rework + handling of empty classes. + 2014-06-04 Jason Merrill <jason@redhat.com> * parser.c (cp_parser_diagnose_invalid_type_name): Give helpful note diff --git a/gcc/cp/cp-gimplify.c b/gcc/cp/cp-gimplify.c index 18142bf..2798358 100644 --- a/gcc/cp/cp-gimplify.c +++ b/gcc/cp/cp-gimplify.c @@ -629,19 +629,12 @@ cp_gimplify_expr (tree *expr_p, gimple_seq *pre_p, gimple_seq *post_p) Also drop volatile variables on the RHS to avoid infinite recursion from gimplify_expr trying to load the value. */ - if (!TREE_SIDE_EFFECTS (op1) - || (DECL_P (op1) && TREE_THIS_VOLATILE (op1))) + if (!TREE_SIDE_EFFECTS (op1)) *expr_p = op0; - else if (TREE_CODE (op1) == MEM_REF - && TREE_THIS_VOLATILE (op1)) - { - /* Similarly for volatile MEM_REFs on the RHS. */ - if (!TREE_SIDE_EFFECTS (TREE_OPERAND (op1, 0))) - *expr_p = op0; - else - *expr_p = build2 (COMPOUND_EXPR, TREE_TYPE (*expr_p), - TREE_OPERAND (op1, 0), op0); - } + else if (TREE_THIS_VOLATILE (op1) + && (REFERENCE_CLASS_P (op1) || DECL_P (op1))) + *expr_p = build2 (COMPOUND_EXPR, TREE_TYPE (*expr_p), + build_fold_addr_expr (op1), op0); else *expr_p = build2 (COMPOUND_EXPR, TREE_TYPE (*expr_p), op0, op1); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index f5e25171..54a4026 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2014-06-05 Richard Biener <rguenther@suse.de> + Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/56961 + * g++.dg/parse/pr56961.C: New. + 2014-06-05 Kai Tietz <ktietz@redhat.com> PR target/46219 diff --git a/gcc/testsuite/g++.dg/parse/pr56961.C b/gcc/testsuite/g++.dg/parse/pr56961.C new file mode 100644 index 0000000..c60cfdb1 --- /dev/null +++ b/gcc/testsuite/g++.dg/parse/pr56961.C @@ -0,0 +1,16 @@ +// PR c++/56961 + +struct foo { }; + +typedef struct +{ + volatile foo fields; +} CSPHandleState; + +CSPHandleState a; + +void fn1 () +{ + CSPHandleState b; + b.fields = foo(); // { dg-error "discards qualifiers" } +} |