Patchwork patch to fix PR55458

login
register
mail settings
Submitter Vladimir Makarov
Date Nov. 27, 2012, 9:56 p.m.
Message ID <50B53714.4040605@redhat.com>
Download mbox | patch
Permalink /patch/202311/
State New
Headers show

Comments

Vladimir Makarov - Nov. 27, 2012, 9:56 p.m.
The following patch fixes

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=55458

   The patch was successfully bootstrapped and tested on x86/x86-64.

   Committed as rev. 193871.

2012-11-27  Vladimir Makarov  <vmakarov@redhat.com>

         PR rtl-optimization/55458
         * lra-assigns.c: Include rtl-error.h.
         (assign_by_spills): Report about asm impossible constraints.
         * Makefile.in (lra-assigns.c): Add $(RTL_ERROR_H).

2012-11-27  Vladimir Makarov  <vmakarov@redhat.com>

         PR rtl-optimization/55458
         * gcc.target/i386/pr55458.c: New test.

Patch

Index: Makefile.in
===================================================================
--- Makefile.in	(revision 193870)
+++ Makefile.in	(working copy)
@@ -3261,7 +3261,7 @@  lra.o : lra.c $(CONFIG_H) $(SYSTEM_H) co
    $(FLAGS_H) $(FUNCTION_H) $(EXPR_H) $(BASIC_BLOCK_H) $(TM_P_H) \
    $(EXCEPT_H) ira.h $(LRA_INT_H)
 lra-assigns.o : lra-assigns.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
-   $(TM_H) $(RTL_H) $(REGS_H) insn-config.h $(DF_H) \
+   $(TM_H) $(RTL_H) $(RTL_ERROR_H) $(REGS_H) insn-config.h $(DF_H) \
    $(RECOG_H) output.h $(REGS_H) hard-reg-set.h $(FLAGS_H) $(FUNCTION_H) \
    $(EXPR_H) $(BASIC_BLOCK_H) $(TM_P_H) $(EXCEPT_H) ira.h \
    rtl-error.h sparseset.h $(LRA_INT_H)
Index: lra-assigns.c
===================================================================
--- lra-assigns.c	(revision 193870)
+++ lra-assigns.c	(working copy)
@@ -81,6 +81,7 @@  along with GCC; see the file COPYING3.	I
 #include "tm.h"
 #include "hard-reg-set.h"
 #include "rtl.h"
+#include "rtl-error.h"
 #include "tm_p.h"
 #include "target.h"
 #include "insn-config.h"
@@ -1209,7 +1210,34 @@  assign_by_spills (void)
 	}
       if (nfails == 0)
 	break;
-      lra_assert (iter == 0);
+      if (iter > 0)
+	{
+	  /* We did not assign hard regs to reload pseudos after two
+	     iteration.  It means something is wrong with asm insn
+	     constraints.  Report it.  */
+	  bool asm_p = false;
+	  bitmap_head failed_reload_insns;
+
+	  bitmap_initialize (&failed_reload_insns, &reg_obstack);
+	  for (i = 0; i < nfails; i++)
+	    bitmap_ior_into (&failed_reload_insns,
+			     &lra_reg_info[sorted_pseudos[i]].insn_bitmap);
+	  EXECUTE_IF_SET_IN_BITMAP (&failed_reload_insns, 0, u, bi)
+	    {
+	      insn = lra_insn_recog_data[u]->insn;
+	      if (asm_noperands (PATTERN (insn)) >= 0)
+		{
+		  asm_p = true;
+		  error_for_asm (insn,
+				 "%<asm%> operand has impossible constraints");
+		  /* Avoid further trouble with this insn.	*/
+		  PATTERN (insn) = gen_rtx_USE (VOIDmode, const0_rtx);
+		  lra_invalidate_insn_data (insn);
+		}
+	    }
+	  lra_assert (asm_p);
+	  break;
+	}
       /* This is a very rare event.  We can not assign a hard
 	 register to reload pseudo because the hard register was
 	 assigned to another reload pseudo on a previous
Index: testsuite/gcc.target/i386/pr55458.c
===================================================================
--- testsuite/gcc.target/i386/pr55458.c	(revision 0)
+++ testsuite/gcc.target/i386/pr55458.c	(working copy)
@@ -0,0 +1,11 @@ 
+/* { dg-do compile } */
+/* { dg-require-effective-target ilp32 } */
+/* { dg-options "-fPIC" } */
+
+int a, b, c;
+
+void
+foo (void)
+{
+  asm volatile ("":"+m" (a), "+m" (b), "+m" (c)); /* { dg-error "operand has impossible constraints" } */
+}