From: Jeff Law <law@redhat.com>
Date: Thu, 22 Oct 2015 19:18:05 +0000 (-0600)
Subject: [PATCH] Fix abort in write_eligible_delay
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=71e558ef30be263c83aa3cb48ba2b4fd13729ec3;p=gcc.git

[PATCH] Fix abort in write_eligible_delay

[PATCH] Fix abort in write_eligible_delay
        * genattrtab.c (main): If we do not have any annul-true or annul-false
        slots, then write out a dummy eligible_for_annul_true or
        eligible_for_annul_false as needed.

From-SVN: r229184
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 08d26a9367c..04d8e1639d0 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2015-10-22  Jeff Law  <law@redhat.com>
+
+	* genattrtab.c (main): If we do not have any annul-true or annul-false
+	slots, then write out a dummy eligible_for_annul_true or
+	eligible_for_annul_false as needed.
+
 2015-10-22  Nick Clifton  <nickc@redhat.com>
 
 	* config/msp430/msp430.opt: Add -msilicon-errata and
diff --git a/gcc/genattrtab.c b/gcc/genattrtab.c
index 8d1fa6c9bbf..32b837c287c 100644
--- a/gcc/genattrtab.c
+++ b/gcc/genattrtab.c
@@ -4411,6 +4411,26 @@ write_indent (FILE *outf, int indent)
     fprintf (outf, " ");
 }
 
+/* If the target does not have annul-true or annul-false delay slots, this
+   function will create a dummy eligible_for function on OUTF which always
+   returns false.  KIND will be annul_true or annul_false.  */
+
+static void
+write_dummy_eligible_delay (FILE *outf, const char *kind)
+{
+  /* Write function prelude.  */
+
+  fprintf (outf, "int\n");
+  fprintf (outf, "eligible_for_%s (rtx_insn *delay_insn ATTRIBUTE_UNUSED,\n"
+		 "    int slot ATTRIBUTE_UNUSED,\n"
+		 "    rtx_insn *candidate_insn ATTRIBUTE_UNUSED,\n"
+		 "    int flags ATTRIBUTE_UNUSED)\n",
+	   kind);
+  fprintf (outf, "{\n");
+  fprintf (outf, "  return 0;\n");
+  fprintf (outf, "}\n\n");
+}
+
 /* Write a subroutine that is given an insn that requires a delay slot, a
    delay slot ordinal, and a candidate insn.  It returns nonzero if the
    candidate can be placed in the specified delay slot of the insn.
@@ -5307,8 +5327,14 @@ main (int argc, char **argv)
      (The function to compute the number of delay slots will be written
      below.)  */
   write_eligible_delay (attr_file, "delay");
-  write_eligible_delay (attr_file, "annul_true");
-  write_eligible_delay (attr_file, "annul_false");
+  if (have_annul_true)
+    write_eligible_delay (attr_file, "annul_true");
+  else
+    write_dummy_eligible_delay (attr_file, "annul_true");
+  if (have_annul_false)
+    write_eligible_delay (attr_file, "annul_false");
+  else
+    write_dummy_eligible_delay (attr_file, "annul_false");
 
   /* Write out constant delay slot info.  */
   write_const_num_delay_slots (attr_file);