diff options
| author | Martin Liska <mliska@suse.cz> | 2014-08-01 10:20:57 +0200 |
|---|---|---|
| committer | Martin Liska <marxin@gcc.gnu.org> | 2014-08-01 08:20:57 +0000 |
| commit | fd29c0247aa4af7492782e6c933c713c6732b4b0 (patch) | |
| tree | 34ecf6784681ee0ad5b65f264b03ec52f19e5524 /gcc/ipa-utils.c | |
| parent | 0ef40c649bd668717cb99a0dfc90a7218bdfbc29 (diff) | |
| download | gcc-fd29c0247aa4af7492782e6c933c713c6732b4b0.zip gcc-fd29c0247aa4af7492782e6c933c713c6732b4b0.tar.gz gcc-fd29c0247aa4af7492782e6c933c713c6732b4b0.tar.bz2 | |
IPA ICF pass 1/N
* gimple-iterator.h (gsi_next_nonvirtual_phi): New function.
* ipa-prop.h (count_formal_params): Global function created from static.
* ipa-prop.c (count_formal_params): Likewise.
* ipa-utils.c (ipa_merge_profiles): Be more tolerant if we merge
profiles for semantically equivalent functions.
* passes.c (do_per_function): If we load body of a function
during WPA, this condition should behave same.
* varpool.c (ctor_for_folding): More tolerant assert for variable
aliases created during WPA.
From-SVN: r213417
Diffstat (limited to 'gcc/ipa-utils.c')
| -rw-r--r-- | gcc/ipa-utils.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/gcc/ipa-utils.c b/gcc/ipa-utils.c index 7810e55..482fc22 100644 --- a/gcc/ipa-utils.c +++ b/gcc/ipa-utils.c @@ -660,13 +660,8 @@ ipa_merge_profiles (struct cgraph_node *dst, if (dst->tp_first_run > src->tp_first_run && src->tp_first_run) dst->tp_first_run = src->tp_first_run; - if (src->profile_id) - { - if (!dst->profile_id) - dst->profile_id = src->profile_id; - else - gcc_assert (src->profile_id == dst->profile_id); - } + if (src->profile_id && !dst->profile_id) + dst->profile_id = src->profile_id; if (!dst->count) return; |