diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2017-12-21 20:26:34 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2017-12-21 20:26:34 +0100 |
| commit | a4710e09ed089313e3d4189d00fcfc487262e05a (patch) | |
| tree | 7eda300f6c4a50ae8f15d3f568032ab17bdd4068 /gcc | |
| parent | da98f7424ee636d5254b5b90adbdb9f880818692 (diff) | |
| download | gcc-a4710e09ed089313e3d4189d00fcfc487262e05a.zip gcc-a4710e09ed089313e3d4189d00fcfc487262e05a.tar.gz gcc-a4710e09ed089313e3d4189d00fcfc487262e05a.tar.bz2 | |
re PR tree-optimization/83521 (ICE: verify_gimple failed (error: invalid operand in unary operation))
PR tree-optimization/83521
* tree-ssa-phiopt.c (factor_out_conditional_conversion): Use
gimple_build_assign without code on result of
fold_build1 (VIEW_CONVERT_EXPR, ...), as it might not create
a VIEW_CONVERT_EXPR.
* gcc.dg/pr83521.c: New test.
From-SVN: r255952
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/pr83521.c | 10 | ||||
| -rw-r--r-- | gcc/tree-ssa-phiopt.c | 8 |
4 files changed, 29 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 9bc3ba3..2b1aa73 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2017-12-21 Jakub Jelinek <jakub@redhat.com> + + PR tree-optimization/83521 + * tree-ssa-phiopt.c (factor_out_conditional_conversion): Use + gimple_build_assign without code on result of + fold_build1 (VIEW_CONVERT_EXPR, ...), as it might not create + a VIEW_CONVERT_EXPR. + 2017-12-21 Andrew Pinski <apinski@cavium.com> Steve Ellcey <sellcey@cavium.com> diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index d6928f0..566efde 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-12-21 Jakub Jelinek <jakub@redhat.com> + + PR tree-optimization/83521 + * gcc.dg/pr83521.c: New test. + 2017-12-21 Nathan Sidwell <nathan@acm.org> PR c++/83406 diff --git a/gcc/testsuite/gcc.dg/pr83521.c b/gcc/testsuite/gcc.dg/pr83521.c new file mode 100644 index 0000000..fc7ca04 --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr83521.c @@ -0,0 +1,10 @@ +/* PR tree-optimization/83521 */ +/* { dg-do compile } */ +/* { dg-options "-O1 -fno-tree-forwprop" } */ + +int +foo (unsigned int x, int y) +{ + int *z = (int *)&x; + return (y == 0) ? y : *z; +} diff --git a/gcc/tree-ssa-phiopt.c b/gcc/tree-ssa-phiopt.c index 71e7b67..9e6eb9c 100644 --- a/gcc/tree-ssa-phiopt.c +++ b/gcc/tree-ssa-phiopt.c @@ -548,8 +548,12 @@ factor_out_conditional_conversion (edge e0, edge e1, gphi *phi, /* Create the conversion stmt and insert it. */ if (convert_code == VIEW_CONVERT_EXPR) - temp = fold_build1 (VIEW_CONVERT_EXPR, TREE_TYPE (result), temp); - new_stmt = gimple_build_assign (result, convert_code, temp); + { + temp = fold_build1 (VIEW_CONVERT_EXPR, TREE_TYPE (result), temp); + new_stmt = gimple_build_assign (result, temp); + } + else + new_stmt = gimple_build_assign (result, convert_code, temp); gsi = gsi_after_labels (gimple_bb (phi)); gsi_insert_before (&gsi, new_stmt, GSI_SAME_STMT); |