From b88eb6da4e9fdac9f97b4d5771b5fb8152c2babf Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Thu, 9 Feb 2012 18:24:47 +0100 Subject: [PATCH] backport: re PR libmudflap/40778 (Mudflap instrumentation missing in cloned function.) Backported from mainline 2012-01-19 Jakub Jelinek PR libmudflap/40778 * tree-mudflap.c (mf_artificial): New function. (execute_mudflap_function_ops, execute_mudflap_function_decls, mx_register_decls, mudflap_enqueue_decl): Use it. * testsuite/libmudflap.c/fail68-frag.c: New test. From-SVN: r184056 --- gcc/ChangeLog | 7 +++++ gcc/tree-mudflap.c | 19 ++++++++----- libmudflap/ChangeLog | 8 ++++++ .../testsuite/libmudflap.c/fail68-frag.c | 27 +++++++++++++++++++ 4 files changed, 55 insertions(+), 6 deletions(-) create mode 100644 libmudflap/testsuite/libmudflap.c/fail68-frag.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a5f8598b3fcf..a53cc30dae03 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,6 +1,13 @@ 2012-02-09 Jakub Jelinek Backported from mainline + 2012-01-19 Jakub Jelinek + + PR libmudflap/40778 + * tree-mudflap.c (mf_artificial): New function. + (execute_mudflap_function_ops, execute_mudflap_function_decls, + mx_register_decls, mudflap_enqueue_decl): Use it. + 2012-01-05 Jakub Jelinek PR rtl-optimization/51767 diff --git a/gcc/tree-mudflap.c b/gcc/tree-mudflap.c index f5ef78b8dc05..019119182392 100644 --- a/gcc/tree-mudflap.c +++ b/gcc/tree-mudflap.c @@ -69,6 +69,13 @@ static tree mx_xfn_xform_decls (gimple_stmt_iterator *, bool *, static gimple_seq mx_register_decls (tree, gimple_seq, location_t); static unsigned int execute_mudflap_function_decls (void); +/* Return true if DECL is artificial stub that shouldn't be instrumented by + mf. We should instrument clones of non-artificial functions. */ +static inline bool +mf_artificial (const_tree decl) +{ + return DECL_ARTIFICIAL (DECL_ORIGIN (decl)); +} /* ------------------------------------------------------------------------ */ /* Some generally helpful functions for mudflap instrumentation. */ @@ -412,8 +419,8 @@ execute_mudflap_function_ops (void) /* Don't instrument functions such as the synthetic constructor built during mudflap_finish_file. */ - if (mf_marked_p (current_function_decl) || - DECL_ARTIFICIAL (current_function_decl)) + if (mf_marked_p (current_function_decl) + || mf_artificial (current_function_decl)) return 0; push_gimplify_context (&gctx); @@ -1014,8 +1021,8 @@ execute_mudflap_function_decls (void) /* Don't instrument functions such as the synthetic constructor built during mudflap_finish_file. */ - if (mf_marked_p (current_function_decl) || - DECL_ARTIFICIAL (current_function_decl)) + if (mf_marked_p (current_function_decl) + || mf_artificial (current_function_decl)) return 0; push_gimplify_context (&gctx); @@ -1097,7 +1104,7 @@ mx_register_decls (tree decl, gimple_seq seq, location_t location) /* Add the __mf_register call at the current appending point. */ if (gsi_end_p (initially_stmts)) { - if (!DECL_ARTIFICIAL (decl)) + if (!mf_artificial (decl)) warning (OPT_Wmudflap, "mudflap cannot track %qE in stub function", DECL_NAME (decl)); @@ -1268,7 +1275,7 @@ mudflap_enqueue_decl (tree obj) during mudflap_finish_file (). That would confuse the user, since the text would refer to variables that don't show up in the user's source code. */ - if (DECL_P (obj) && DECL_EXTERNAL (obj) && DECL_ARTIFICIAL (obj)) + if (DECL_P (obj) && DECL_EXTERNAL (obj) && mf_artificial (obj)) return; VEC_safe_push (tree, gc, deferred_static_decls, obj); diff --git a/libmudflap/ChangeLog b/libmudflap/ChangeLog index dbd2e54ce603..5f1d24df2310 100644 --- a/libmudflap/ChangeLog +++ b/libmudflap/ChangeLog @@ -1,3 +1,11 @@ +2012-02-09 Jakub Jelinek + + Backported from mainline + 2012-01-19 Jakub Jelinek + + PR libmudflap/40778 + * testsuite/libmudflap.c/fail68-frag.c: New test. + 2011-11-20 Andreas Tobler * configure: Regenerate. diff --git a/libmudflap/testsuite/libmudflap.c/fail68-frag.c b/libmudflap/testsuite/libmudflap.c/fail68-frag.c new file mode 100644 index 000000000000..7b2f8cf2cb04 --- /dev/null +++ b/libmudflap/testsuite/libmudflap.c/fail68-frag.c @@ -0,0 +1,27 @@ +/* PR libmudflap/40778 */ + +char p[32]; +static int j; + +__attribute__((noinline)) +static void foo (int i) +{ + if (j++ == 0) + p[i + 4] = 12; + else + p[i - 4] = 13; +} + +int +main () +{ + foo (30); + foo (30); + foo (30); + return 0; +} + +/* { dg-output "mudflap violation 1.*" } */ +/* { dg-output "Nearby object 1.*" } */ +/* { dg-output "mudflap object.*name.*p" } */ +/* { dg-do run { xfail *-*-* } } */ -- 2.47.2