From da14d5e5fb57ddd90cd1b6ff5f001aa09bd167eb Mon Sep 17 00:00:00 2001 From: dalej Date: Tue, 16 Nov 2004 01:26:00 +0000 Subject: [PATCH] 2004-11-15 Dale Johannesen * profile.c (compute_branch_probabilities): Prevent crash with EH in RTL-based profiling. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@90711 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 5 +++++ gcc/profile.c | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 5c50807..eec443f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2004-11-15 Dale Johannesen + + * profile.c (compute_branch_probabilities): Prevent + crash with EH in RTL-based profiling. + 2004-11-16 Kazu Hirata * tree-cfg.c (verify_expr): Replace TREE_OPERAND with diff --git a/gcc/profile.c b/gcc/profile.c index 93d79d0..318defd 100644 --- a/gcc/profile.c +++ b/gcc/profile.c @@ -569,10 +569,13 @@ compute_branch_probabilities (void) } } /* Otherwise try to preserve the existing REG_BR_PROB probabilities - tree based profile guessing put into code. */ + tree based profile guessing put into code. BB can be the + ENTRY_BLOCK, and it can have multiple (fake) successors in + EH cases, but it still has no code; don't crash in this case. */ else if (profile_status == PROFILE_ABSENT && !ir_type () && EDGE_COUNT (bb->succs) > 1 + && BB_END (bb) && (note = find_reg_note (BB_END (bb), REG_BR_PROB, 0))) { int prob = INTVAL (XEXP (note, 0)); -- 2.7.4