re PR ipa/83051 (ICE on valid code at -O3: in edge_badness, at ipa-inline.c:1024)

	PR ipa/83051
	* ipa-inline.c (flatten_function): Do not overwrite final inlining
	failure.
	* gcc.c-torture/compile/pr83051-2.c: New testcase.

From-SVN: r256818

gcc/ChangeLog

+2018-01-17  Jan Hubicka  <hubicka@ucw.cz>
+
+	PR ipa/83051
+	* ipa-inline.c (flatten_function): Do not overwrite final inlining
+	failure.
+
 2018-01-17  Will Schmidt  <will_schmidt@vnet.ibm.com>
 
 	* config/rs6000/rs6000.c (rs6000_gimple_builtin): Add gimple folding

gcc/ipa-inline.c

@@ -2083,7 +2083,8 @@ flatten_function (struct cgraph_node *node, bool early)
 		     "Not inlining %s into %s to avoid cycle.\n",
 		     xstrdup_for_dump (callee->name ()),
 		     xstrdup_for_dump (e->caller->name ()));
-	  e->inline_failed = CIF_RECURSIVE_INLINING;
+	  if (cgraph_inline_failed_type (e->inline_failed) != CIF_FINAL_ERROR)
+	    e->inline_failed = CIF_RECURSIVE_INLINING;
 	  continue;
 	}
 

gcc/testsuite/ChangeLog

+2018-01-17  Jan Hubicka  <hubicka@ucw.cz>
+
+	PR ipa/83051
+	* gcc.c-torture/compile/pr83051-2.c: New testcase.
+
 2018-01-17  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	PR c++/81054

gcc/testsuite/gcc.c-torture/compile/pr83051-2.c

+/* { dg-options "-fno-early-inlining" } */
+void
+bar ()
+{
+  bar (0);
+}
+
+__attribute__ ((flatten))
+void foo ()
+{
+  bar ();
+}