From 3cd361256dc895fb91f5a8d248a5bbc89457621b Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Thu, 3 Aug 2017 11:37:55 +0000 Subject: [PATCH] Apply finish_options on DECL_FUNCTION_SPECIFIC_OPTIMIZATION for ACCEL_COMPILER 2017-08-03 Tom de Vries PR lto/81430 * tree-streamer-in.c (lto_input_ts_function_decl_tree_pointers): If ACCEL_COMPILER, apply finish_options on DECL_FUNCTION_SPECIFIC_OPTIMIZATION. From-SVN: r250852 --- gcc/ChangeLog | 7 +++++++ gcc/tree-streamer-in.c | 16 ++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 0449bfc..d2cd6b4 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,12 @@ 2017-08-03 Tom de Vries + PR lto/81430 + * tree-streamer-in.c (lto_input_ts_function_decl_tree_pointers): If + ACCEL_COMPILER, apply finish_options on + DECL_FUNCTION_SPECIFIC_OPTIMIZATION. + +2017-08-03 Tom de Vries + PR target/81662 * config/nvptx/nvptx.c (nvptx_option_override): Emit sorry if function_entry_patch_area_size > 0. diff --git a/gcc/tree-streamer-in.c b/gcc/tree-streamer-in.c index d7b6d22..eb41e75 100644 --- a/gcc/tree-streamer-in.c +++ b/gcc/tree-streamer-in.c @@ -33,6 +33,7 @@ along with GCC; see the file COPYING3. If not see #include "ipa-chkp.h" #include "gomp-constants.h" #include "asan.h" +#include "opts.h" /* Read a STRING_CST from the string table in DATA_IN using input @@ -769,6 +770,21 @@ lto_input_ts_function_decl_tree_pointers (struct lto_input_block *ib, DECL_FUNCTION_SPECIFIC_TARGET (expr) = stream_read_tree (ib, data_in); #endif DECL_FUNCTION_SPECIFIC_OPTIMIZATION (expr) = stream_read_tree (ib, data_in); +#ifdef ACCEL_COMPILER + { + tree opts = DECL_FUNCTION_SPECIFIC_OPTIMIZATION (expr); + if (opts) + { + struct gcc_options tmp; + init_options_struct (&tmp, NULL); + cl_optimization_restore (&tmp, TREE_OPTIMIZATION (opts)); + finish_options (&tmp, &global_options_set, UNKNOWN_LOCATION); + opts = build_optimization_node (&tmp); + finalize_options_struct (&tmp); + DECL_FUNCTION_SPECIFIC_OPTIMIZATION (expr) = opts; + } + } +#endif /* If the file contains a function with an EH personality set, then it was compiled with -fexceptions. In that case, initialize -- 2.7.4