diff options
| author | rth <rth@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-05-05 10:53:47 +0000 |
|---|---|---|
| committer | rth <rth@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-05-05 10:53:47 +0000 |
| commit | 74a9462b2f86435c4ed0d3c6ce05b97c754f81b9 (patch) | |
| tree | 9b300dd3fbf8b2564cb06b0dc4ab8c105fdcb509 | |
| parent | 8bbd1a30525d51ddc23e1179771f9d3abff43f9a (diff) | |
| download | gcc-74a9462b2f86435c4ed0d3c6ce05b97c754f81b9.tar.gz | |
* flow.c (init_propagate_block_info): Fix merge error
in HAVE_conditional_execution code.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@33705 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/flow.c | 4 |
2 files changed, 8 insertions, 3 deletions
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 <denisc@overta.ru> +2000-05-05 Richard Henderson <rth@cygnus.com> + + * flow.c (init_propagate_block_info): Fix merge error + in HAVE_conditional_execution code. + +Fri May 5 07:43:50 2000 Denis Chertykov <denisc@overta.ru> * 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); }); } |