re PR middle-end/51949 (expand_call: seg fault caused by IPA split)

2012-01-23  Richard Guenther  <rguenther@suse.de>

	PR tree-optimization/51949
	* ipa-split.c (execute_split_functions): Do not split malloc
	functions.

	* gcc.dg/torture/pr51949.c: New testcase.

From-SVN: r183424

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 80f124a65deab63531ac37cfbfcb0e79a0276b54..60697f851992e454b7bfde05a48060646ce124d9 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2012-01-23  Richard Guenther  <rguenther@suse.de>
+
+       PR tree-optimization/51949
+       * ipa-split.c (execute_split_functions): Do not split malloc
+       functions.
+
 2012-01-23  Jakub Jelinek  <jakub@redhat.com>
 
        PR rtl-optimization/51933

diff --git a/gcc/ipa-split.c b/gcc/ipa-split.c
index 09e04af5b886dd4121e6f2fb57a2164b1c2ace19..124098ce669a2a05eb299c98fe72a0d274bf835a 100644 (file)
--- a/gcc/ipa-split.c
+++ b/gcc/ipa-split.c
@@ -1395,10 +1395,11 @@ execute_split_functions (void)
   int todo = 0;
   struct cgraph_node *node = cgraph_get_node (current_function_decl);
 
-  if (flags_from_decl_or_type (current_function_decl) & ECF_NORETURN)
+  if (flags_from_decl_or_type (current_function_decl)
+      & (ECF_NORETURN|ECF_MALLOC))
     {
       if (dump_file)
-       fprintf (dump_file, "Not splitting: noreturn function.\n");
+       fprintf (dump_file, "Not splitting: noreturn/malloc function.\n");
       return 0;
     }
   if (MAIN_NAME_P (DECL_NAME (current_function_decl)))

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index dee2c0d13b1f0eae487104e6d620c31f0eb270a8..1abdae78845eb0768b1cd6551be7892fa60bbe88 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-23  Richard Guenther  <rguenther@suse.de>
+
+       PR tree-optimization/51949
+       * gcc.dg/torture/pr51949.c: New testcase.
+
 2012-01-23  Jakub Jelinek  <jakub@redhat.com>
 
        PR rtl-optimization/51933

diff --git a/gcc/testsuite/gcc.dg/torture/pr51949.c b/gcc/testsuite/gcc.dg/torture/pr51949.c
new file mode 100644 (file)
index 0000000..e23bd7b
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/torture/pr51949.c
@@ -0,0 +1,20 @@
+/* { dg-do compile } */
+
+typedef long unsigned int size_t;
+extern __attribute__ ((malloc)) void *mem_alloc(size_t);
+void *mem_alloc(size_t amount)
+{
+  void *q = __builtin_malloc (amount);
+  if (!q) {
+      __builtin_printf("malloc");
+      __builtin_exit(255);
+  }
+}
+void mem_realloc()
+{
+  mem_alloc(1);
+}
+void put_env_var()
+{
+  mem_alloc(1);
+}