summaryrefslogtreecommitdiff
path: root/gcc/tree-eh.c
diff options
context:
space:
mode:
authorrguenth <rguenth@138bc75d-0d04-0410-961f-82ee72b054a4>2010-05-30 19:52:53 +0000
committerrguenth <rguenth@138bc75d-0d04-0410-961f-82ee72b054a4>2010-05-30 19:52:53 +0000
commit151000185c0403bf828986583afef0bf6b4f80b7 (patch)
tree8f4e7597676168c07f9f377dec63e2b7b47a0b1e /gcc/tree-eh.c
parent163c9fff10da83b267cca88560d99bf4a7c68cf7 (diff)
downloadgcc-151000185c0403bf828986583afef0bf6b4f80b7.tar.gz
2010-05-30 Richard Guenther <rguenther@suse.de>
PR lto/42975 * tree-eh.c (execute_cleanup_eh_1): Copy from execute_cleanup_eh. (execute_cleanup_eh): Clear DECL_FUNCTION_PERSONALITY if it is no longer needed. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@160059 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/tree-eh.c')
-rw-r--r--gcc/tree-eh.c17
1 files changed, 16 insertions, 1 deletions
diff --git a/gcc/tree-eh.c b/gcc/tree-eh.c
index a7dd72b3da1..9c17c1e092e 100644
--- a/gcc/tree-eh.c
+++ b/gcc/tree-eh.c
@@ -3857,7 +3857,7 @@ cleanup_all_empty_eh (void)
*/
static unsigned int
-execute_cleanup_eh (void)
+execute_cleanup_eh_1 (void)
{
/* Do this first: unsplit_all_eh and cleanup_all_empty_eh can die
looking up unreachable landing pads. */
@@ -3891,6 +3891,21 @@ execute_cleanup_eh (void)
return 0;
}
+static unsigned int
+execute_cleanup_eh (void)
+{
+ int ret = execute_cleanup_eh_1 ();
+
+ /* If the function no longer needs an EH personality routine
+ clear it. This exposes cross-language inlining opportunities
+ and avoids references to a never defined personality routine. */
+ if (DECL_FUNCTION_PERSONALITY (current_function_decl)
+ && function_needs_eh_personality (cfun) != eh_personality_lang)
+ DECL_FUNCTION_PERSONALITY (current_function_decl) = NULL_TREE;
+
+ return ret;
+}
+
static bool
gate_cleanup_eh (void)
{