cgraphunit.c (cgraph_node::expand_thunk): Don't expand instrumentation thunks.

	* cgraphunit.c (cgraph_node::expand_thunk): Don't expand
	instrumentation thunks.

From-SVN: r221852

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b37e15d32e0064356a9bbe1f12eb7af09f13d3a7..fee8cb55acf421e9deef55e0c121dbb5e7ef3177 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-02  Ilya Enkovich  <ilya.enkovich@intel.com>
+
+       * cgraphunit.c (cgraph_node::expand_thunk): Don't expand
+       instrumentation thunks.
+
 2015-04-02  Ilya Enkovich  <ilya.enkovich@intel.com>
 
        * config/i386/i386.c (ix86_expand_call): Avoid nested

diff --git a/gcc/cgraphunit.c b/gcc/cgraphunit.c
index 8ac92e1c0c866052de77b5195a17685b5f6367e1..77ef9edba4ae14a544621ae41efdb759d23ecfaa 100644 (file)
--- 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,