backport: [multiple changes]

2016-03-26  Richard Biener  <rguenther@suse.de> Prathamesh Kulkarni  <prathamesh.kulkarni@linaro.org>

2017-01-20  Martin Liska  <mliska@suse.cz>

	Backport from mainline
	2016-03-26  Richard Biener  <rguenther@suse.de>
	            Prathamesh Kulkarni  <prathamesh.kulkarni@linaro.org>

	PR ipa/70366
	* ipa-inline-transform.c (inline_call): Pass opts_for_fn (to->decl)
	instead of
	TREE_OPTIMIZATION (DECL_FUNCTION_SPECIFIC_OPTIMIZATION (to->decl))
	as 2nd argument to cl_optimization_restore().

From-SVN: r244708

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f9c24273fff77e9d78fd1ac6c62198c409b62e77..065ba81ef14c56e2429ec8f69ec5576a27e45e84 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,15 @@
+2017-01-20  Martin Liska  <mliska@suse.cz>
+
+       Backport from mainline
+       2016-03-26  Richard Biener  <rguenther@suse.de>
+                   Prathamesh Kulkarni  <prathamesh.kulkarni@linaro.org>
+
+       PR ipa/70366
+       * ipa-inline-transform.c (inline_call): Pass opts_for_fn (to->decl)
+       instead of
+       TREE_OPTIMIZATION (DECL_FUNCTION_SPECIFIC_OPTIMIZATION (to->decl))
+       as 2nd argument to cl_optimization_restore().
+
 2017-01-20  Martin Liska  <mliska@suse.cz>
 
        Backport from mainline

diff --git a/gcc/ipa-inline-transform.c b/gcc/ipa-inline-transform.c
index b160e9f139058da48a48d440c30782eb3ddad370..c56ada49c98d0e34b2e48bdbdf1461fa633cab6e 100644 (file)
--- a/gcc/ipa-inline-transform.c
+++ b/gcc/ipa-inline-transform.c
@@ -346,8 +346,7 @@ inline_call (struct cgraph_edge *e, bool update_original,
     {
       struct gcc_options opts = global_options;
 
-      cl_optimization_restore (&opts,
-        TREE_OPTIMIZATION (DECL_FUNCTION_SPECIFIC_OPTIMIZATION (to->decl)));
+      cl_optimization_restore (&opts, opts_for_fn (to->decl));
       opts.x_flag_strict_aliasing = false;
       if (dump_file)
        fprintf (dump_file, "Dropping flag_strict_aliasing on %s:%i\n",