diff options
author | Richard Guenther <rguenther@suse.de> | 2011-11-08 15:16:22 +0000 |
---|---|---|
committer | Richard Biener <rguenth@gcc.gnu.org> | 2011-11-08 15:16:22 +0000 |
commit | f2906a8e9e0ed8aba6a7e39a1986f785e9d467f1 (patch) | |
tree | c00e0356ac03d362aa0c47b542073da126813776 /gcc/ipa-prop.c | |
parent | a59526334d3f36a43f94cdd29ac661eb59260bc6 (diff) | |
download | gcc-f2906a8e9e0ed8aba6a7e39a1986f785e9d467f1.zip gcc-f2906a8e9e0ed8aba6a7e39a1986f785e9d467f1.tar.gz gcc-f2906a8e9e0ed8aba6a7e39a1986f785e9d467f1.tar.bz2 |
re PR tree-optimization/51012 (ICE: in fold_convert_loc, at fold-const.c:1897 with -fno-early-inlining and passing incompatible function ptr)
2011-11-08 Richard Guenther <rguenther@suse.de>
PR tree-optimization/51012
* ipa-prop.c (update_indirect_edges_after_inlining): Fixup
non-inlinable state.
* cgraph.c (cgraph_make_edge_direct): Likewise.
* gcc.dg/pr51012-1.c: New testcase.
* gcc.dg/pr51012-2.c: Likewise.
From-SVN: r181166
Diffstat (limited to 'gcc/ipa-prop.c')
-rw-r--r-- | gcc/ipa-prop.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/gcc/ipa-prop.c b/gcc/ipa-prop.c index 7946aca..69f0453 100644 --- a/gcc/ipa-prop.c +++ b/gcc/ipa-prop.c @@ -1905,6 +1905,13 @@ update_indirect_edges_after_inlining (struct cgraph_edge *cs, if (new_direct_edge) { new_direct_edge->indirect_inlining_edge = 1; + if (new_direct_edge->call_stmt + && !gimple_check_call_matching_types (new_direct_edge->call_stmt, + new_direct_edge->callee->decl)) + { + gimple_call_set_cannot_inline (new_direct_edge->call_stmt, true); + new_direct_edge->call_stmt_cannot_inline_p = true; + } if (new_edges) { VEC_safe_push (cgraph_edge_p, heap, *new_edges, |