(insn_cuid): New function.

(INSN_CUID): Sometimes call it.

From-SVN: r11986

diff --git a/gcc/combine.c b/gcc/combine.c
index 05031d2a824a00a0a925552ef904b7ed81c6c515..889e93ebc61bf801a4eba69bef71989427b5c5d8 100644 (file)
--- a/gcc/combine.c
+++ b/gcc/combine.c
@@ -140,9 +140,8 @@ static int max_uid_cuid;
 
 /* Get the cuid of an insn.  */
 
-#define INSN_CUID(INSN) (INSN_UID (INSN) > max_uid_cuid                \
-                        ? (abort(), 0)                         \
-                        : uid_cuid[INSN_UID (INSN)])
+#define INSN_CUID(INSN) \
+(INSN_UID (INSN) > max_uid_cuid ? insn_cuid (INSN) : uid_cuid[INSN_UID (INSN)])
 
 /* Maximum register number, which is the size of the tables below.  */
 
@@ -446,6 +445,7 @@ static int reg_bitfield_target_p  PROTO((rtx, rtx));
 static void distribute_notes   PROTO((rtx, rtx, rtx, rtx, rtx, rtx));
 static void distribute_links   PROTO((rtx));
 static void mark_used_regs_combine PROTO((rtx));
+static int insn_cuid           PROTO((rtx));
 \f
 /* Main entry point for combiner.  F is the first insn of the function.
    NREGS is the first unused pseudo-reg number.  */
@@ -11191,6 +11191,22 @@ distribute_links (links)
     }
 }
 \f
+/* Compute INSN_CUID for INSN, which is an insn made by combine.  */
+
+static int
+insn_cuid (insn)
+     rtx insn;
+{
+  while (insn != 0 && INSN_UID (insn) > max_uid_cuid
+        && GET_CODE (insn) == INSN && GET_CODE (PATTERN (insn)) == USE)
+    insn = NEXT_INSN (insn);
+
+  if (INSN_UID (insn) > max_uid_cuid)
+    abort ();
+
+  return INSN_CUID (insn);
+}
+\f
 void
 dump_combine_stats (file)
      FILE *file;