From: Richard Henderson Date: Fri, 5 May 2000 10:53:47 +0000 (-0700) Subject: flow.c (init_propagate_block_info): Fix merge error in HAVE_conditional_execution... X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ad3958e7dbc34f94ea03d86eeaaf29e57c2721f3;p=gcc.git flow.c (init_propagate_block_info): Fix merge error in HAVE_conditional_execution code. * flow.c (init_propagate_block_info): Fix merge error in HAVE_conditional_execution code. From-SVN: r33705 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 27ba7f06f42..b4ef3843884 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,4 +1,9 @@ - Fri May 5 07:43:50 2000 Denis Chertykov +2000-05-05 Richard Henderson + + * flow.c (init_propagate_block_info): Fix merge error + in HAVE_conditional_execution code. + +Fri May 5 07:43:50 2000 Denis Chertykov * config/avr/avr.c (out_shift_with_cnt): Genetare a more optimal shift cycle for unknown shift count. Also generates dec + brpl. diff --git a/gcc/flow.c b/gcc/flow.c index 3b901e46752..cdbf541f58f 100644 --- a/gcc/flow.c +++ b/gcc/flow.c @@ -3607,7 +3607,7 @@ init_propagate_block_info (bb, live, local_set, flags) { if (GET_CODE (XEXP (cond_true, 0)) != REG) abort (); - SET_REGNO_REG_SET (pbi.reg_cond_reg, REGNO (XEXP (cond_true, 0))); + SET_REGNO_REG_SET (pbi->reg_cond_reg, REGNO (XEXP (cond_true, 0))); /* For each such register, mark it conditionally dead. */ EXECUTE_IF_SET_IN_REG_SET @@ -3624,7 +3624,7 @@ init_propagate_block_info (bb, live, local_set, flags) cond = cond_true; rcli->condition = alloc_EXPR_LIST (0, cond, NULL_RTX); - splay_tree_insert (pbi.reg_cond_dead, i, + splay_tree_insert (pbi->reg_cond_dead, i, (splay_tree_value) rcli); }); }