ira.c (insn_contains_asm_1, [...]): Delete.

gcc/
	* ira.c (insn_contains_asm_1, insn_contains_asm): Delete.
	(compute_regs_asm_clobbered): Use extract_asm_operands instead.

From-SVN: r213318

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7176ee8d08622d329bf5fd51d5751f0e5361af45..f1e11839ff6aaff0e456f4025b5848ab1a9b2bc5 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2014-07-31  Richard Sandiford  <rdsandiford@googlemail.com>
+
+       * ira.c (insn_contains_asm_1, insn_contains_asm): Delete.
+       (compute_regs_asm_clobbered): Use extract_asm_operands instead.
+
 2014-07-31  Richard Biener  <rguenther@suse.de>
 
        * data-streamer.h (streamer_write_data_stream): Declare here,

diff --git a/gcc/ira.c b/gcc/ira.c
index 1dd21871865951832b2448873d9ee055986f233c..ccc6c7988621fc85b7c4692940c315c9e60e13cf 100644 (file)
--- a/gcc/ira.c
+++ b/gcc/ira.c
@@ -2221,25 +2221,6 @@ ira_bad_reload_regno (int regno, rtx in, rtx out)
          || ira_bad_reload_regno_1 (regno, out));
 }
 
-/* Return TRUE if *LOC contains an asm.  */
-static int
-insn_contains_asm_1 (rtx *loc, void *data ATTRIBUTE_UNUSED)
-{
-  if ( !*loc)
-    return FALSE;
-  if (GET_CODE (*loc) == ASM_OPERANDS)
-    return TRUE;
-  return FALSE;
-}
-
-
-/* Return TRUE if INSN contains an ASM.  */
-static bool
-insn_contains_asm (rtx insn)
-{
-  return for_each_rtx (&insn, insn_contains_asm_1, NULL);
-}
-
 /* Add register clobbers from asm statements.  */
 static void
 compute_regs_asm_clobbered (void)
@@ -2253,7 +2234,7 @@ compute_regs_asm_clobbered (void)
        {
          df_ref def;
 
-         if (insn_contains_asm (insn))
+         if (NONDEBUG_INSN_P (insn) && extract_asm_operands (PATTERN (insn)))
            FOR_EACH_INSN_DEF (def, insn)
              {
                unsigned int dregno = DF_REF_REGNO (def);