re PR middle-end/25776 (ICE in cgraph after error at -O1 and above)

2006-05-20  Andrew Pinski  <pinskia@physics.uc.edu>

        PR middle-end/25776
        * cgraphunit.c (cgraph_optimize): Don't run ipa passes if error
        or sorry count is non zero.

2006-05-20  Andrew Pinski  <pinskia@physics.uc.edu>

        PR middle-end/25776
        * g++.dg/other/error11.C: New test.

From-SVN: r113941

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7deb475d038c0a5cb5b4d514a1519b0f65fc8efc..f05e632982e6ad213497a8af4a573d8512c1b55b 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-20  Andrew Pinski  <pinskia@physics.uc.edu>
+
+       PR middle-end/25776
+       * cgraphunit.c (cgraph_optimize): Don't run ipa passes if error
+       or sorry count is non zero.
+
 2006-05-20  Andreas Schwab  <schwab@suse.de>
 
        * config/pa/pa-linux.h (STRING_ASM_OP): Prepend and append a tab.

diff --git a/gcc/cgraphunit.c b/gcc/cgraphunit.c
index 5ff4fffa85449a6f70e26dead4af884fc1fb999e..44b3d4f05d4eee3b285e4bd23e82e1f7eba4db03 100644 (file)
--- a/gcc/cgraphunit.c
+++ b/gcc/cgraphunit.c
@@ -1410,7 +1410,11 @@ cgraph_optimize (void)
       fprintf (cgraph_dump_file, "Marked ");
       dump_cgraph (cgraph_dump_file);
     }
-  ipa_passes ();
+    
+  /* Don't run the IPA passes if there was any error or sorry messages.  */
+  if (errorcount == 0 && sorrycount == 0)
+    ipa_passes ();
+
   /* This pass remove bodies of extern inline functions we never inlined.
      Do this later so other IPA passes see what is really going on.  */
   cgraph_remove_unreachable_nodes (false, dump_file);

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 10b3a7d237555a9372bcb95ea94600be1f0d1ca3..d558ee28521a7596d7b568e8768281078874c557 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-20  Andrew Pinski  <pinskia@physics.uc.edu>
+
+       PR middle-end/25776
+       * g++.dg/other/error11.C: New test. 
+
 2006-05-20  Richard Sandiford  <richard@codesourcery.com>
 
        * gcc.target/mips/pr26765.c: Add -w to options.

diff --git a/gcc/testsuite/g++.dg/other/error11.C b/gcc/testsuite/g++.dg/other/error11.C
new file mode 100644 (file)
index 0000000..d8a641c
--- /dev/null
+++ b/gcc/testsuite/g++.dg/other/error11.C
@@ -0,0 +1,17 @@
+/* { dg-options "-O1" } */
+struct A
+{
+  ERROR; /* { dg-error "ERROR" } */
+  ~A();
+};
+
+struct B
+{
+  virtual ~B();
+};
+
+struct C : B, A {};
+
+struct D : C {};
+
+D d;