diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b37e15d32e0..fee8cb55acf 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2015-04-02 Ilya Enkovich + + * cgraphunit.c (cgraph_node::expand_thunk): Don't expand + instrumentation thunks. + 2015-04-02 Ilya Enkovich * config/i386/i386.c (ix86_expand_call): Avoid nested diff --git a/gcc/cgraphunit.c b/gcc/cgraphunit.c index 8ac92e1c0c8..77ef9edba4a 100644 --- a/gcc/cgraphunit.c +++ b/gcc/cgraphunit.c @@ -1508,6 +1508,10 @@ cgraph_node::expand_thunk (bool output_asm_thunks, bool force_gimple_thunk) tree thunk_fndecl = decl; tree a; + /* Instrumentation thunk is the same function with + a different signature. Never need to expand it. */ + if (thunk.add_pointer_bounds_args) + return false; if (!force_gimple_thunk && this_adjusting && targetm.asm_out.can_output_mi_thunk (thunk_fndecl, fixed_offset,