aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog8
-rw-r--r--gcc/cgraphunit.c3
-rw-r--r--gcc/passes.c3
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gcc.c-torture/compile/pr39834.c13
5 files changed, 31 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 594c0a6..233028f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2009-06-08 Jan Hubicka <jh@suse.cz>
+
+ PR middle-end/39834
+ * cgraphunit.c (save_inline_function_body): Do not copy transform hooks
+ for saved inline bodies.
+ * ipa-passes.c (do_per_function): Do not add the hoks multiple times
+ for given function.
+
2009-06-08 Adam Nemet <anemet@caviumnetworks.com>
* jump.c (returnjump_p): Handle delayed branches. Add missing
diff --git a/gcc/cgraphunit.c b/gcc/cgraphunit.c
index 70b2682..907488c 100644
--- a/gcc/cgraphunit.c
+++ b/gcc/cgraphunit.c
@@ -1688,6 +1688,9 @@ save_inline_function_body (struct cgraph_node *node)
DECL_ONE_ONLY (first_clone->decl) = 0;
TREE_PUBLIC (first_clone->decl) = 0;
DECL_COMDAT (first_clone->decl) = 0;
+ VEC_free (ipa_opt_pass, heap,
+ DECL_STRUCT_FUNCTION (first_clone->decl)->ipa_transforms_to_apply);
+ DECL_STRUCT_FUNCTION (first_clone->decl)->ipa_transforms_to_apply = NULL;
#ifdef ENABLE_CHECKING
verify_cgraph_node (first_clone);
diff --git a/gcc/passes.c b/gcc/passes.c
index 2408668..f146670 100644
--- a/gcc/passes.c
+++ b/gcc/passes.c
@@ -844,7 +844,8 @@ do_per_function (void (*callback) (void *data), void *data)
{
struct cgraph_node *node;
for (node = cgraph_nodes; node; node = node->next)
- if (node->analyzed && gimple_has_body_p (node->decl))
+ if (node->analyzed && gimple_has_body_p (node->decl)
+ && (!node->clone_of || node->decl != node->clone_of->decl))
{
push_cfun (DECL_STRUCT_FUNCTION (node->decl));
current_function_decl = node->decl;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 56dc2bc..e20679a 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,10 @@
2009-06-08 Jan Hubicka <jh@suse.cz>
+ PR debug/39834
+ * gcc.dg/torture/pr39834.c
+
+2009-06-08 Jan Hubicka <jh@suse.cz>
+
PR middle-end/40102
* g++.dg/torture/pr40102.C: New testcase.
diff --git a/gcc/testsuite/gcc.c-torture/compile/pr39834.c b/gcc/testsuite/gcc.c-torture/compile/pr39834.c
new file mode 100644
index 0000000..ecc3977a
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/compile/pr39834.c
@@ -0,0 +1,13 @@
+/* { dg-options "-O1 -Winline" } */
+void quit_mined ();
+void bottom_line ();
+typedef enum { False, True } FLAG;
+inline void
+nextfile (FLAG exitiflast)
+{
+ if (exitiflast)
+ quit_mined ();
+ else
+ bottom_line ();
+ nextfile (True);
+}