* loop.c (prescan_loop): Move checks for NOTE_INSN_LOOP_CONT

	and NOTE_INSN_LOOP_VTOP to...
	(find_and_verify_loops) ...here.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@35976 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5dca539..0c9961e 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2000-08-26  Michael Hayes  <mhayes@cygnus.com>
+
+       * loop.c (prescan_loop): Move checks for NOTE_INSN_LOOP_CONT
+       and NOTE_INSN_LOOP_VTOP to...
+       (find_and_verify_loops) ...here.
+
 Fri Aug 25 04:21:13 2000  Alexandre Oliva  <aoliva@redhat.com>
 
        * crtstuff.c (CRT_CALL_STATIC_FUNCTION): Define default.

diff --git a/gcc/loop.c b/gcc/loop.c
index fe9e0d4..dccdcd9 100644 (file)
--- a/gcc/loop.c
+++ b/gcc/loop.c
@@ -2396,8 +2396,6 @@ prescan_loop (loop)
   loop_info->has_volatile = 0;
   loop_info->has_tablejump = 0;
   loop_info->has_multiple_exit_targets = 0;
-  loop->cont = 0;
-  loop->vtop = 0;
   loop->level = 1;
 
   unknown_address_altered = 0;
@@ -2421,25 +2419,6 @@ prescan_loop (loop)
          else if (NOTE_LINE_NUMBER (insn) == NOTE_INSN_LOOP_END)
            {
              --level;
-             if (level == 0)
-               {
-                 end = insn;
-                 break;
-               }
-           }
-         else if (NOTE_LINE_NUMBER (insn) == NOTE_INSN_LOOP_CONT)
-           {
-             if (level == 1)
-               loop->cont = insn;
-           }
-         else if (NOTE_LINE_NUMBER (insn) == NOTE_INSN_LOOP_VTOP)
-           {
-             /* If there is a NOTE_INSN_LOOP_VTOP, then this is a for
-                or while style loop, with a loop exit test at the
-                start.  Thus, we can assume that the loop condition
-                was true when the loop was entered.  */
-             if (level == 1)
-               loop->vtop = insn;
            }
        }
       else if (GET_CODE (insn) == CALL_INSN)
@@ -2532,7 +2511,7 @@ prescan_loop (loop)
    and the continue note that is a the destination of a (cond)jump after
    the continue note.  If there is any (cond)jump between the loop start
    and what we have so far as LOOP->CONT_DOMINATOR that has a
-   target between LOOP->DOMINATOR and the continue note, move
+   target between LOOP->CONT_DOMINATOR and the continue note, move
    LOOP->CONT_DOMINATOR forward to that label; if a jump's
    destination cannot be determined, clear LOOP->CONT_DOMINATOR.  */
 
@@ -2640,6 +2619,11 @@ find_and_verify_loops (f, loops)
          case NOTE_INSN_LOOP_CONT:
            current_loop->cont = insn;
            break;
+
+         case NOTE_INSN_LOOP_VTOP:
+           current_loop->vtop = insn;
+           break;
+
          case NOTE_INSN_LOOP_END:
            if (! current_loop)
              abort ();
@@ -2653,7 +2637,7 @@ find_and_verify_loops (f, loops)
            break;
          }
       /* If for any loop, this is a jump insn between the NOTE_INSN_LOOP_CONT
-        and NOTE_INSN_LOOP_END notes, update loop->dominator.  */
+        and NOTE_INSN_LOOP_END notes, update loop->cont_dominator.  */
       else if (GET_CODE (insn) == JUMP_INSN
               && GET_CODE (PATTERN (insn)) != RETURN
               && current_loop)
@@ -2670,7 +2654,7 @@ find_and_verify_loops (f, loops)
              if (loop->cont && loop->cont_dominator != const0_rtx)
                {
                  /* If the jump destination is not known, invalidate
-                    loop->const_dominator.  */
+                    loop->cont_dominator.  */
                  if (! label)
                    loop->cont_dominator = const0_rtx;
                  else