diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-12-05 09:24:44 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-12-05 09:24:44 +0000 |
| commit | 55c4b664c2b65a2a346b55beec474e0404634c18 (patch) | |
| tree | 3b804fec819d027d915850ec88821f23ed5538ea /gcc/ipa-prop.c | |
| parent | 3af4a6046ed483eb5301a47290e40328d40f954c (diff) | |
| download | gcc-55c4b664c2b65a2a346b55beec474e0404634c18.tar.gz | |
2011-12-05 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 182001 using svnmerge
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@182003 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ipa-prop.c')
| -rw-r--r-- | gcc/ipa-prop.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/gcc/ipa-prop.c b/gcc/ipa-prop.c index 69f0453ee4f..25ae3868c31 100644 --- a/gcc/ipa-prop.c +++ b/gcc/ipa-prop.c @@ -1905,13 +1905,10 @@ 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_direct_edge->call_stmt) + new_direct_edge->call_stmt_cannot_inline_p + = !gimple_check_call_matching_types (new_direct_edge->call_stmt, + new_direct_edge->callee->decl); if (new_edges) { VEC_safe_push (cgraph_edge_p, heap, *new_edges, @@ -2577,9 +2574,6 @@ ipa_modify_call_arguments (struct cgraph_edge *cs, gimple stmt, gimple_set_location (new_stmt, gimple_location (stmt)); gimple_call_set_chain (new_stmt, gimple_call_chain (stmt)); gimple_call_copy_flags (new_stmt, stmt); - if (gimple_call_cannot_inline_p (stmt)) - gimple_call_set_cannot_inline - (new_stmt, !gimple_check_call_matching_types (new_stmt, callee_decl)); if (dump_file && (dump_flags & TDF_DETAILS)) { |