From 4f0e4109bf6a5bb57a67fe07f45c58c6efba97e6 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Tue, 19 Jun 2007 11:11:22 +0200 Subject: [PATCH] re PR tree-optimization/32353 (Miscompilation with RESULT_DECL) PR tree-optimization/32353 * tree-ssa-structalias.c (set_uids_in_ptset): Also handle RESULT_DECL. * g++.dg/opt/nrv13.C: New test. From-SVN: r125842 --- gcc/ChangeLog | 5 ++++ gcc/testsuite/ChangeLog | 5 ++++ gcc/testsuite/g++.dg/opt/nrv13.C | 42 ++++++++++++++++++++++++++++++++ gcc/tree-ssa-structalias.c | 3 ++- 4 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/opt/nrv13.C diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 907b1d37c7b0..e6c4aa78658a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2007-06-19 Jakub Jelinek + + PR tree-optimization/32353 + * tree-ssa-structalias.c (set_uids_in_ptset): Also handle RESULT_DECL. + 2007-06-17 Eric Botcazou * config/sparc/sparc.c (sparc_vis_init_builtins): Retrieve the diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 64140257177e..a0a0ba0ab36b 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2007-06-19 Jakub Jelinek + + PR tree-optimization/32353 + * g++.dg/opt/nrv13.C: New test. + 2007-06-15 Mark Mitchell * g++.dg/lookup/anon6.C: New test. diff --git a/gcc/testsuite/g++.dg/opt/nrv13.C b/gcc/testsuite/g++.dg/opt/nrv13.C new file mode 100644 index 000000000000..bb49a3a6e4f8 --- /dev/null +++ b/gcc/testsuite/g++.dg/opt/nrv13.C @@ -0,0 +1,42 @@ +// PR tree-optimization/32353 +// { dg-do run } +// { dg-options "-O2" } + +extern "C" void abort (); + +struct A +{ + int f; + A (int x) : f (x) {} +}; + +A +foo (const A &x, const A &y) +{ + A r (0); + r = x.f == -111 ? y : (y.f == -111 || x.f > y.f) ? x : y; + A s (0); + r = r.f == -111 ? s : (r.f > s.f) ? r : s; + return r; +} + +int +main () +{ + if (foo (A (0), A (1)).f != 1) + abort (); + if (foo (A (1), A (9)).f != 9) + abort (); + if (foo (A (9), A (1)).f != 9) + abort (); + if (foo (A (-4), A (-5)).f != 0) + abort (); + if (foo (A (-111), A (-111)).f != 0) + abort (); + if (foo (A (2), A (-111)).f != 2) + abort (); + if (foo (A (-111), A (6)).f != 6) + abort (); + if (foo (A (-111), A (-4)).f != 0) + abort (); +} diff --git a/gcc/tree-ssa-structalias.c b/gcc/tree-ssa-structalias.c index f35b58f128c2..70c1aaaf0132 100644 --- a/gcc/tree-ssa-structalias.c +++ b/gcc/tree-ssa-structalias.c @@ -4343,7 +4343,8 @@ set_uids_in_ptset (tree ptr, bitmap into, bitmap from) bitmap_set_bit (into, DECL_UID (sv->var)); } else if (TREE_CODE (vi->decl) == VAR_DECL - || TREE_CODE (vi->decl) == PARM_DECL) + || TREE_CODE (vi->decl) == PARM_DECL + || TREE_CODE (vi->decl) == RESULT_DECL) { if (var_can_have_subvars (vi->decl) && get_subvars_for_var (vi->decl))