diff options
| author | Richard Biener <rguenther@suse.de> | 2018-11-20 08:06:09 +0000 |
|---|---|---|
| committer | Richard Biener <rguenth@gcc.gnu.org> | 2018-11-20 08:06:09 +0000 |
| commit | 07b9f1de1ea532a66d8ac103f3a9827521d780f9 (patch) | |
| tree | 1de93f563d84b963315706bca28ba1aa89b3ec66 | |
| parent | 14b6a72109964eaf00aa3a46f0f9776bbcaef067 (diff) | |
| download | gcc-07b9f1de1ea532a66d8ac103f3a9827521d780f9.zip gcc-07b9f1de1ea532a66d8ac103f3a9827521d780f9.tar.gz gcc-07b9f1de1ea532a66d8ac103f3a9827521d780f9.tar.bz2 | |
re PR lto/88087 (ICE in execute at tree-ssa-pre.c:4220 since r266183)
2018-11-20 Richard Biener <rguenther@suse.de>
PR tree-optimization/88087
* tree-ssa-pre.c (create_expression_by_pieces): Re-materialize
call fntype.
* tree-ssa-sccvn.c (copy_reference_ops_from_call): Remember
call fntype.
* gcc.dg/tree-ssa/pr88087.c: New testcase.
From-SVN: r266301
| -rw-r--r-- | gcc/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/tree-ssa/pr88087.c | 17 | ||||
| -rw-r--r-- | gcc/tree-ssa-pre.c | 3 | ||||
| -rw-r--r-- | gcc/tree-ssa-sccvn.c | 2 |
5 files changed, 33 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 712146f..0c357fb 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,13 @@ 2018-11-20 Richard Biener <rguenther@suse.de> + PR tree-optimization/88087 + * tree-ssa-pre.c (create_expression_by_pieces): Re-materialize + call fntype. + * tree-ssa-sccvn.c (copy_reference_ops_from_call): Remember + call fntype. + +2018-11-20 Richard Biener <rguenther@suse.de> + PR middle-end/88089 * tree-data-ref.c (lambda_matrix_right_hermite): Use abs_hwi. diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 29e6744..4284ce2 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-11-20 Richard Biener <rguenther@suse.de> + + PR tree-optimization/88087 + * gcc.dg/tree-ssa/pr88087.c: New testcase. + 2018-11-19 Paul Koning <ni1d@arrl.net> * gcc.c-torture/execute/align-3.c: Skip if pdp11. diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr88087.c b/gcc/testsuite/gcc.dg/tree-ssa/pr88087.c new file mode 100644 index 0000000..d0061b6 --- /dev/null +++ b/gcc/testsuite/gcc.dg/tree-ssa/pr88087.c @@ -0,0 +1,17 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -fdump-tree-pre-stats" } */ + +int f(); +int d; +void c() +{ + for (;;) + { + f(); + int (*fp)() __attribute__((const)) = (void *)f; + d = fp(); + } +} + +/* We shouldn't ICE and hoist the const call of fp out of the loop. */ +/* { dg-final { scan-tree-dump "Eliminated: 1" "pre" } } */ diff --git a/gcc/tree-ssa-pre.c b/gcc/tree-ssa-pre.c index 20d3c78..4d5bce8 100644 --- a/gcc/tree-ssa-pre.c +++ b/gcc/tree-ssa-pre.c @@ -2792,9 +2792,10 @@ create_expression_by_pieces (basic_block block, pre_expr expr, args.quick_push (arg); } gcall *call = gimple_build_call_vec (fn, args); + gimple_call_set_fntype (call, currop->type); if (sc) gimple_call_set_chain (call, sc); - tree forcedname = make_ssa_name (currop->type); + tree forcedname = make_ssa_name (TREE_TYPE (currop->type)); gimple_call_set_lhs (call, forcedname); /* There's no CCP pass after PRE which would re-compute alignment information so make sure we re-materialize this here. */ diff --git a/gcc/tree-ssa-sccvn.c b/gcc/tree-ssa-sccvn.c index 4364191..01bedf5 100644 --- a/gcc/tree-ssa-sccvn.c +++ b/gcc/tree-ssa-sccvn.c @@ -1206,7 +1206,7 @@ copy_reference_ops_from_call (gcall *call, /* Copy the type, opcode, function, static chain and EH region, if any. */ memset (&temp, 0, sizeof (temp)); - temp.type = gimple_call_return_type (call); + temp.type = gimple_call_fntype (call); temp.opcode = CALL_EXPR; temp.op0 = gimple_call_fn (call); temp.op1 = gimple_call_chain (call); |