From 8b316874a1c1c823d97d7575039b726e4202f681 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Mon, 18 Jul 2011 21:41:45 +0200 Subject: [PATCH] re PR middle-end/49675 (ICE (segfault) with -finstrument-functions) PR middle-end/49675 * tree.c (build_common_builtin_nodes): Register __builtin_return_address, __cyg_profile_func_enter and __cyg_profile_func_exit. * gfortran.dg/pr49675.f90: New test. From-SVN: r176417 --- gcc/ChangeLog | 7 +++++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gfortran.dg/pr49675.f90 | 6 ++++++ gcc/tree.c | 25 +++++++++++++++++++++++++ 4 files changed, 43 insertions(+) create mode 100644 gcc/testsuite/gfortran.dg/pr49675.f90 diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 4bfd455628a..8a30143f578 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2011-07-18 Jakub Jelinek + + PR middle-end/49675 + * tree.c (build_common_builtin_nodes): Register + __builtin_return_address, __cyg_profile_func_enter + and __cyg_profile_func_exit. + 2011-07-18 Richard Henderson * bb-reorder.c (emit_barrier_after_bb): Split out of ... diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 32f59bd279b..03b4441c29d 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2011-07-18 Jakub Jelinek + + PR middle-end/49675 + * gfortran.dg/pr49675.f90: New test. + 2011-07-18 Richard Guenther * gcc.dg/torture/20110718-1.c: New testcase. diff --git a/gcc/testsuite/gfortran.dg/pr49675.f90 b/gcc/testsuite/gfortran.dg/pr49675.f90 new file mode 100644 index 00000000000..06fd1b665bd --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr49675.f90 @@ -0,0 +1,6 @@ +! PR middle-end/49675 +! { dg-do compile } +! { dg-options "-finstrument-functions" } +end +! { dg-final { scan-assembler "__cyg_profile_func_enter" } } +! { dg-final { scan-assembler "__cyg_profile_func_exit" } } diff --git a/gcc/tree.c b/gcc/tree.c index 10f50de8a52..8c44851a18b 100644 --- a/gcc/tree.c +++ b/gcc/tree.c @@ -9546,6 +9546,31 @@ build_common_builtin_nodes (void) ? "_Unwind_SjLj_Resume" : "_Unwind_Resume"), ECF_NORETURN); + if (built_in_decls[BUILT_IN_RETURN_ADDRESS] == NULL_TREE) + { + ftype = build_function_type_list (ptr_type_node, integer_type_node, + NULL_TREE); + local_define_builtin ("__builtin_return_address", ftype, + BUILT_IN_RETURN_ADDRESS, + "__builtin_return_address", + ECF_NOTHROW); + } + + if (built_in_decls[BUILT_IN_PROFILE_FUNC_ENTER] == NULL_TREE + || built_in_decls[BUILT_IN_PROFILE_FUNC_EXIT] == NULL_TREE) + { + ftype = build_function_type_list (void_type_node, ptr_type_node, + ptr_type_node, NULL_TREE); + if (built_in_decls[BUILT_IN_PROFILE_FUNC_ENTER] == NULL_TREE) + local_define_builtin ("__cyg_profile_func_enter", ftype, + BUILT_IN_PROFILE_FUNC_ENTER, + "__cyg_profile_func_enter", 0); + if (built_in_decls[BUILT_IN_PROFILE_FUNC_EXIT] == NULL_TREE) + local_define_builtin ("__cyg_profile_func_exit", ftype, + BUILT_IN_PROFILE_FUNC_EXIT, + "__cyg_profile_func_exit", 0); + } + /* The exception object and filter values from the runtime. The argument must be zero before exception lowering, i.e. from the front end. After exception lowering, it will be the region number for the exception -- 2.30.2