From: Jan Hubicka <jh@suse.cz>
Date: Thu, 6 May 2010 14:15:22 +0000 (+0200)
Subject: re PR tree-optimization/43791 (kernel/rtmutex.c:1138:1: internal compiler error:... 
X-Git-Tag: releases/gcc-4.6.0~7457
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ef38b55137fbca9d9834c770e62ff46a7f20a181;p=thirdparty%2Fgcc.git

re PR tree-optimization/43791 (kernel/rtmutex.c:1138:1: internal compiler error: in cgraph_decide_inlining_of_small_functions, at ipa-inline.c:1009)

	PR tree-optimization/43791
	* ipa-inline.c (update_caller_keys): Remove bogus
	disregard_inline_limits check.

	* gcc.c-torture/compile/pr43791.c: New file.

From-SVN: r159108
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c5288a9926c8..06988c83c8cf 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-06  Jan Hubicka  <jh@suse.cz>
+
+	PR tree-optimization/43791
+	* ipa-inline.c (update_caller_keys): Remove bogus
+	disregard_inline_limits check.
+
 2010-05-06  Michael Matz  <matz@suse.de>
 
 	PR tree-optimization/43984
diff --git a/gcc/ipa-inline.c b/gcc/ipa-inline.c
index e18a0cd0ddd4..5f9fe102ba1f 100644
--- a/gcc/ipa-inline.c
+++ b/gcc/ipa-inline.c
@@ -664,7 +664,7 @@ update_caller_keys (fibheap_t heap, struct cgraph_node *node,
   struct cgraph_edge *edge;
   cgraph_inline_failed_t failed_reason;
 
-  if (!node->local.inlinable || node->local.disregard_inline_limits
+  if (!node->local.inlinable
       || node->global.inlined_to)
     return;
   if (bitmap_bit_p (updated_nodes, node->uid))
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a51f4db560eb..680c4554e4e2 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-06  Jan Hubicka  <jh@suse.cz>
+
+	PR tree-optimization/43791
+	* gcc.c-torture/compile/pr43791.c: New file.
+
 2010-05-06  Michael Matz  <matz@suse.de>
 
 	PR tree-optimization/43984
diff --git a/gcc/testsuite/gcc.c-torture/compile/pr43791.c b/gcc/testsuite/gcc.c-torture/compile/pr43791.c
new file mode 100644
index 000000000000..38cb3c8e00aa
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/compile/pr43791.c
@@ -0,0 +1,21 @@
+int owner();
+int clear();
+
+static void fixup() {
+   clear();
+}
+
+inline __attribute__ ((always_inline))
+void slowtrylock(void) {
+     if (owner())
+         fixup();
+}
+
+void fasttrylock(void (*slowfn)()) {
+     slowfn();
+}
+
+void trylock(void) {
+     fasttrylock(slowtrylock);
+}
+