From 5b9db1bc19b99bc1f401dcadeaa616155f31521a Mon Sep 17 00:00:00 2001 From: Martin Jambor Date: Mon, 21 Jan 2013 18:16:57 +0100 Subject: re PR middle-end/56022 (ICE (segfault) at convert_memory_address_addr_space (explow.c:334)) 2013-01-21 Martin Jambor PR middle-end/56022 * function.c (allocate_struct_function): Call invoke_set_current_function_hook earlier. testsuite/ * gcc.target/i386/pr56022.c: New test. From-SVN: r195341 --- gcc/function.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gcc/function.c') diff --git a/gcc/function.c b/gcc/function.c index bb6a9ae..4ce2259 100644 --- a/gcc/function.c +++ b/gcc/function.c @@ -4479,7 +4479,6 @@ get_last_funcdef_no (void) void allocate_struct_function (tree fndecl, bool abstract_p) { - tree result; tree fntype = fndecl ? TREE_TYPE (fndecl) : NULL_TREE; cfun = ggc_alloc_cleared_function (); @@ -4498,8 +4497,13 @@ allocate_struct_function (tree fndecl, bool abstract_p) DECL_STRUCT_FUNCTION (fndecl) = cfun; cfun->decl = fndecl; current_function_funcdef_no = get_next_funcdef_no (); + } + + invoke_set_current_function_hook (fndecl); - result = DECL_RESULT (fndecl); + if (fndecl != NULL_TREE) + { + tree result = DECL_RESULT (fndecl); if (!abstract_p && aggregate_value_p (result, fndecl)) { #ifdef PCC_STATIC_STRUCT_RETURN @@ -4518,8 +4522,6 @@ allocate_struct_function (tree fndecl, bool abstract_p) but is this worth the hassle? */ cfun->can_throw_non_call_exceptions = flag_non_call_exceptions; } - - invoke_set_current_function_hook (fndecl); } /* This is like allocate_struct_function, but pushes a new cfun for FNDECL -- cgit v1.1