* emit-rtl.c (active_insn_p): Revert last change.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 97e46f9..30a220d 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2002-09-27  Richard Henderson  <rth@redhat.com>
+
+       * emit-rtl.c (active_insn_p): Revert last change.
+
 2002-09-27  Jakub Jelinek  <jakub@redhat.com>
 
        * doc/extend.texi (tls_model): Document.

diff --git a/gcc/emit-rtl.c b/gcc/emit-rtl.c
index 3dd4799..889064f 100644 (file)
--- a/gcc/emit-rtl.c
+++ b/gcc/emit-rtl.c
@@ -3021,34 +3021,11 @@ int
 active_insn_p (insn)
      rtx insn;
 {
-  if (GET_CODE (insn) == CALL_INSN || GET_CODE (insn) == JUMP_INSN)
-    return true;
-  if (GET_CODE (insn) == INSN)
-    {
-      if (reload_completed)
-       {
-         rtx pat = PATTERN (insn);
-
-         /* After reload, remaining USE insns are noops.  */
-         if (GET_CODE (pat) == USE)
-           return false;
-
-         if (GET_CODE (pat) == CLOBBER)
-           {
-             /* ??? Don't skip past the clobber of the return register.
-                If we eliminate it, we risk a variety of life analysis
-                problems on broken code.  */
-             if (GET_CODE (XEXP (pat, 0)) == REG
-                 && REG_FUNCTION_VALUE_P (XEXP (pat, 0)))
-               return true;
-
-             /* Otherwise, clobbers don't do anything either.  */
-             return false;
-           }
-       }
-      return true;
-    }
-  return false;
+  return (GET_CODE (insn) == CALL_INSN || GET_CODE (insn) == JUMP_INSN
+         || (GET_CODE (insn) == INSN
+             && (! reload_completed
+                 || (GET_CODE (PATTERN (insn)) != USE
+                     && GET_CODE (PATTERN (insn)) != CLOBBER))));
 }
 
 rtx