From: Martin Liska Date: Fri, 20 Jan 2017 12:04:46 +0000 (+0100) Subject: backport: [multiple changes] X-Git-Tag: releases/gcc-5.5.0~574 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0edc4aec3591dcb30a0a34f3c26f7c992f8fd5b9;p=thirdparty%2Fgcc.git backport: [multiple changes] 2016-03-26 Richard Biener Prathamesh Kulkarni 2017-01-20 Martin Liska Backport from mainline 2016-03-26 Richard Biener Prathamesh Kulkarni 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 f9c24273fff7..065ba81ef14c 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,15 @@ +2017-01-20 Martin Liska + + Backport from mainline + 2016-03-26 Richard Biener + Prathamesh Kulkarni + + 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 Backport from mainline diff --git a/gcc/ipa-inline-transform.c b/gcc/ipa-inline-transform.c index b160e9f13905..c56ada49c98d 100644 --- 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",