diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-06-06 09:41:09 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-06-06 09:41:09 +0000 |
| commit | a5b5b624bd32ed2a8cdef6c91105a0c58ead9e0a (patch) | |
| tree | a8ba90785cb82182fb5dd973f850d3ab8a6f2973 /gcc/ipa-inline-analysis.c | |
| parent | 825825ba216d22b9b0cc6b4df4cc80e25a4df432 (diff) | |
| download | gcc-a5b5b624bd32ed2a8cdef6c91105a0c58ead9e0a.tar.gz | |
2012-06-06 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 188257 using svnmerge
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@188260 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ipa-inline-analysis.c')
| -rw-r--r-- | gcc/ipa-inline-analysis.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gcc/ipa-inline-analysis.c b/gcc/ipa-inline-analysis.c index f0111cb66b4..a38d2608cbd 100644 --- a/gcc/ipa-inline-analysis.c +++ b/gcc/ipa-inline-analysis.c @@ -2514,16 +2514,16 @@ remap_edge_change_prob (struct cgraph_edge *inlined_edge, { struct ipa_jump_func *jfunc = ipa_get_ith_jump_func (args, i); if (jfunc->type == IPA_JF_PASS_THROUGH - && (jfunc->value.pass_through.formal_id + && (ipa_get_jf_pass_through_formal_id (jfunc) < (int) VEC_length (inline_param_summary_t, - inlined_es->param))) + inlined_es->param))) { + int jf_formal_id = ipa_get_jf_pass_through_formal_id (jfunc); int prob1 = VEC_index (inline_param_summary_t, es->param, i)->change_prob; int prob2 = VEC_index (inline_param_summary_t, - inlined_es->param, - jfunc->value.pass_through.formal_id)->change_prob; + inlined_es->param, jf_formal_id)->change_prob; int prob = ((prob1 * prob2 + REG_BR_PROB_BASE / 2) / REG_BR_PROB_BASE); @@ -2649,8 +2649,8 @@ inline_merge_summary (struct cgraph_edge *edge) int map = -1; /* TODO: handle non-NOPs when merging. */ if (jfunc->type == IPA_JF_PASS_THROUGH - && jfunc->value.pass_through.operation == NOP_EXPR) - map = jfunc->value.pass_through.formal_id; + && ipa_get_jf_pass_through_operation (jfunc) == NOP_EXPR) + map = ipa_get_jf_pass_through_formal_id (jfunc); VEC_replace (int, operand_map, i, map); gcc_assert (map < ipa_get_param_count (IPA_NODE_REF (to))); } |