flow.c (init_propagate_block_info): Fix merge error in HAVE_conditional_execution...

        * 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 27ba7f06f426b5d62356d1826900e85c5b1e00e9..b4ef3843884efbf6857c6c8b9bdedb4be58e2abf 100644 (file)
--- 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 3b901e46752d51d6ce2345a86aa69303a8fde0cf..cdbf541f58f53051c5247eede38fe3628bd66adb 100644 (file)
--- 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);
             });
        }