From b16650ac472b03123a7190c84d6c75daf8a6557c Mon Sep 17 00:00:00 2001 From: Jan Hubicka Date: Sun, 18 Jan 2015 18:42:11 +0100 Subject: [PATCH] ipa-icf-32.c: Update template. * gcc.dg/ipa/ipa-icf-32.c: Update template. * c-c++-common/asan/instrument-with-calls-3.c: Likewise. * c-c++-common/asan/instrument-with-calls-2.c: Likewise. * c-c++-common/asan/instrument-with-calls-1.c: Likewise. * c-c++-common/asan/kasan-recover-1.c: Likewise. * c-c++-common/asan/kasan-recover-2.c: Likewise. * ipa-reference.c (set_reference_optimization_summary, ipa_reference_get_not_written_global): Do nothing if ipa-reference is disabled. (ignore_module_statics): New static var. (propagate_bits): If ipa-reference is disabled, do not look into local properties. (analyze_function): Disable analysis when ipa_reference is disabled. (generate_summary): Do not dump when reference is disabled; collect vars accessed from functions with ipa-reference disabled. (get_read_write_all_from_node): When ipa-reference is disabled, use the node flags. (gate): Enable for LTO. (ignore_edge_p): New function. (propagate): Skip functions w/o ipa-reference analysis. * optc-save-gen.awk: Handle optimize_debug correctly. * opth-gen.awk: Likewise. * common.opt (fauto-inc-dec, fdelete-dead-exceptions, ffunction-cse, fgraphite, fstrict-volatile-bitfields, fira-algorithm, fira-region, fira-share-save-slots, fira-share-spill-slots, fmodulo-sched-allow-regmoves, fpartial-inlining, sched-stalled-insns, fsched-stalled-insns-dep, fstrict-overflow, ftracer, ftree-parallelize-loops, fassociative-math, freciprocal-math, fvect-cost-model, fsimd-cost-model): Mark as Optimization (fauto-profile, fcommon, fdata-sections, fipa-icf-variables, ftoplevel-reorder, funit-at-a-time, fwhole-program): Do not mark as Optimization. * ipa-icf.c (gate, sem_item_optimizer::filter_removed_items): Fix for IPA. From-SVN: r219823 --- gcc/ChangeLog | 30 ++++++++ gcc/common.opt | 54 +++++++-------- gcc/ipa-icf.c | 5 +- gcc/ipa-reference.c | 68 ++++++++++++++++--- gcc/optc-save-gen.awk | 10 ++- gcc/opth-gen.awk | 3 +- gcc/testsuite/ChangeLog | 9 +++ .../asan/instrument-with-calls-1.c | 2 +- .../asan/instrument-with-calls-2.c | 2 +- .../asan/instrument-with-calls-3.c | 2 +- .../c-c++-common/asan/kasan-recover-1.c | 2 +- .../c-c++-common/asan/kasan-recover-2.c | 2 +- gcc/testsuite/gcc.dg/ipa/ipa-icf-32.c | 4 +- 13 files changed, 142 insertions(+), 51 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 00a9622928d..a858d1f154f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,33 @@ +2015-01-18 Jan Hubicka + + * ipa-reference.c (set_reference_optimization_summary, + ipa_reference_get_not_written_global): Do nothing if ipa-reference is disabled. + (ignore_module_statics): New static var. + (propagate_bits): If ipa-reference is disabled, do not look into local properties. + (analyze_function): Disable analysis when ipa_reference is disabled. + (generate_summary): Do not dump when reference is disabled; + collect vars accessed from functions with ipa-reference disabled. + (get_read_write_all_from_node): When ipa-reference is disabled, use the + node flags. + (gate): Enable for LTO. + (ignore_edge_p): New function. + (propagate): Skip functions w/o ipa-reference analysis. + * optc-save-gen.awk: Handle optimize_debug correctly. + * opth-gen.awk: Likewise. + * common.opt (fauto-inc-dec, fdelete-dead-exceptions, ffunction-cse, + fgraphite, fstrict-volatile-bitfields, fira-algorithm, fira-region, + fira-share-save-slots, fira-share-spill-slots, + fmodulo-sched-allow-regmoves, fpartial-inlining, + sched-stalled-insns, fsched-stalled-insns-dep, fstrict-overflow, + ftracer, ftree-parallelize-loops, fassociative-math, + freciprocal-math, fvect-cost-model, fsimd-cost-model): Mark as + Optimization + (fauto-profile, fcommon, fdata-sections, fipa-icf-variables, + ftoplevel-reorder, funit-at-a-time, fwhole-program): Do not mark as + Optimization. + * ipa-icf.c (gate, sem_item_optimizer::filter_removed_items): + Fix for IPA. + 2015-01-18 Jan Hubicka PR ipa/64378 diff --git a/gcc/common.opt b/gcc/common.opt index c3219604836..22a3b6bca80 100644 --- a/gcc/common.opt +++ b/gcc/common.opt @@ -912,11 +912,11 @@ Common Report Var(flag_asynchronous_unwind_tables) Optimization Generate unwind tables that are exact at each instruction boundary fauto-inc-dec -Common Report Var(flag_auto_inc_dec) Init(1) +Common Report Var(flag_auto_inc_dec) Init(1) Optimization Generate auto-inc/dec instructions fauto-profile -Common Report Var(flag_auto_profile) Optimization +Common Report Var(flag_auto_profile) Use sample profile information for call graph node weights. The default profile file is fbdata.afdo in 'pwd'. @@ -981,7 +981,7 @@ Common Report Var(flag_combine_stack_adjustments) Optimization Looks for opportunities to reduce stack adjustments and stack references. fcommon -Common Report Var(flag_no_common,0) Optimization +Common Report Var(flag_no_common,0) Do not put uninitialized globals in the common section fcompare-debug @@ -1029,7 +1029,7 @@ Common Report Var(flag_cx_fortran_rules) Optimization Complex multiplication and division follow Fortran rules fdata-sections -Common Report Var(flag_data_sections) Optimization +Common Report Var(flag_data_sections) Place data items into their own section fdbg-cnt-list @@ -1059,7 +1059,7 @@ Common Report Var(flag_delayed_branch) Optimization Attempt to fill delay slots of branch instructions fdelete-dead-exceptions -Common Report Var(flag_delete_dead_exceptions) Init(0) +Common Report Var(flag_delete_dead_exceptions) Init(0) Optimization Delete dead instructions that may throw exceptions fdelete-null-pointer-checks @@ -1268,7 +1268,7 @@ Enum(fp_contract_mode) String(fast) Value(FP_CONTRACT_FAST) ; Used for compiling the Unix kernel, where strange substitutions are ; done on the assembly output. ffunction-cse -Common Report Var(flag_no_function_cse,0) +Common Report Var(flag_no_function_cse,0) Optimization Allow function addresses to be held in registers ffunction-sections @@ -1299,7 +1299,7 @@ has finished ; This option is not documented yet as its semantics will change. fgraphite -Common Report Var(flag_graphite) +Common Report Var(flag_graphite) Opitmization Enable in and out of Graphite representation fgraphite-identity @@ -1348,7 +1348,7 @@ Common Report Var(flag_loop_optimize_isl) Optimization Enable the ISL based loop nest optimizer fstrict-volatile-bitfields -Common Report Var(flag_strict_volatile_bitfields) Init(-1) +Common Report Var(flag_strict_volatile_bitfields) Init(-1) Optimization Force bitfield accesses to match their type width fguess-branch-probability @@ -1477,7 +1477,7 @@ Common Report Var(flag_ipa_icf_functions) Optimization Perform Identical Code Folding for functions fipa-icf-variables -Common Report Var(flag_ipa_icf_variables) Optimization +Common Report Var(flag_ipa_icf_variables) Perform Identical Code Folding for variables fipa-reference @@ -1493,7 +1493,7 @@ Common Ignore Does nothing. Preserved for backward compatibility. fira-algorithm= -Common Joined RejectNegative Enum(ira_algorithm) Var(flag_ira_algorithm) Init(IRA_ALGORITHM_CB) +Common Joined RejectNegative Enum(ira_algorithm) Var(flag_ira_algorithm) Init(IRA_ALGORITHM_CB) Optimization -fira-algorithm=[CB|priority] Set the used IRA algorithm Enum @@ -1506,7 +1506,7 @@ EnumValue Enum(ira_algorithm) String(priority) Value(IRA_ALGORITHM_PRIORITY) fira-region= -Common Joined RejectNegative Enum(ira_region) Var(flag_ira_region) Init(IRA_REGION_AUTODETECT) +Common Joined RejectNegative Enum(ira_region) Var(flag_ira_region) Init(IRA_REGION_AUTODETECT) Optimization -fira-region=[one|all|mixed] Set regions for IRA Enum @@ -1532,11 +1532,11 @@ Use IRA based register pressure calculation in RTL loop optimizations. fira-share-save-slots -Common Report Var(flag_ira_share_save_slots) Init(1) +Common Report Var(flag_ira_share_save_slots) Init(1) Optimization Share slots for saving different hard registers. fira-share-spill-slots -Common Report Var(flag_ira_share_spill_slots) Init(1) +Common Report Var(flag_ira_share_spill_slots) Init(1) Optimization Share stack slots for spilled pseudo-registers. fira-verbose= @@ -1658,7 +1658,7 @@ Common Report Var(flag_modulo_sched) Optimization Perform SMS based modulo scheduling before the first scheduling pass fmodulo-sched-allow-regmoves -Common Report Var(flag_modulo_sched_allow_regmoves) +Common Report Var(flag_modulo_sched_allow_regmoves) Optimization Perform SMS based modulo scheduling with register moves allowed fmove-loop-invariants @@ -1719,7 +1719,7 @@ Common Report Var(flag_optimize_sibling_calls) Optimization Optimize sibling and tail recursive calls fpartial-inlining -Common Report Var(flag_partial_inlining) +Common Report Var(flag_partial_inlining) Optimization Perform partial inlining fpre-ipa-mem-report @@ -1966,7 +1966,7 @@ Common Report Var(flag_sched_stalled_insns) Optimization UInteger Allow premature scheduling of queued insns fsched-stalled-insns= -Common RejectNegative Joined UInteger +Common RejectNegative Joined UInteger Optimization -fsched-stalled-insns= Set number of queued insns that can be prematurely scheduled ; sched_stalled_insns_dep controls how many recently scheduled cycles will @@ -1978,7 +1978,7 @@ Common Report Var(flag_sched_stalled_insns_dep,1) Init(1) Optimization UInteger Set dependence distance checking in premature scheduling of queued insns fsched-stalled-insns-dep= -Common RejectNegative Joined UInteger +Common RejectNegative Joined UInteger Optimization -fsched-stalled-insns-dep= Set dependence distance checking in premature scheduling of queued insns fsched-group-heuristic @@ -2114,7 +2114,7 @@ Common Report Var(flag_strict_aliasing) Optimization Assume strict aliasing rules apply fstrict-overflow -Common Report Var(flag_strict_overflow) +Common Report Var(flag_strict_overflow) Optimization Treat signed overflow as undefined fsync-libcalls @@ -2157,11 +2157,11 @@ EnumValue Enum(tls_model) String(local-exec) Value(TLS_MODEL_LOCAL_EXEC) ftoplevel-reorder -Common Report Var(flag_toplevel_reorder) Init(2) Optimization +Common Report Var(flag_toplevel_reorder) Init(2) Reorder top level functions, variables, and asms ftracer -Common Report Var(flag_tracer) +Common Report Var(flag_tracer) Optimization Perform superblock formation via tail duplication ; Zero means that floating-point math operations cannot generate a @@ -2285,7 +2285,7 @@ Common Report Var(flag_tree_loop_optimize) Init(1) Optimization Enable loop optimizations on tree level ftree-parallelize-loops= -Common Report Joined RejectNegative UInteger Var(flag_tree_parallelize_loops) Init(1) +Common Report Joined RejectNegative UInteger Var(flag_tree_parallelize_loops) Init(1) Optimization Enable automatic parallelization of loops ftree-phiprop @@ -2337,7 +2337,7 @@ Common Report Var(flag_tree_vrp) Init(0) Optimization Perform Value Range Propagation on trees funit-at-a-time -Common Report Var(flag_unit_at_a_time) Init(1) Optimization +Common Report Var(flag_unit_at_a_time) Init(1) Compile whole compilation unit at a time funroll-loops @@ -2356,12 +2356,12 @@ Common Report Var(flag_unsafe_loop_optimizations) Optimization Allow loop optimizations to assume that the loops behave in normal way fassociative-math -Common Report Var(flag_associative_math) SetByCombined +Common Report Var(flag_associative_math) SetByCombined Optimization Allow optimization for floating-point arithmetic which may change the result of the operation due to rounding. freciprocal-math -Common Report Var(flag_reciprocal_math) SetByCombined +Common Report Var(flag_reciprocal_math) SetByCombined Optimization Same as -fassociative-math for expressions which include division. ; Nonzero means that unsafe floating-point math optimizations are allowed @@ -2439,11 +2439,11 @@ Common Report Var(flag_tree_slp_vectorize) Optimization Enable basic block vectorization (SLP) on trees fvect-cost-model= -Common Joined RejectNegative Enum(vect_cost_model) Var(flag_vect_cost_model) Init(VECT_COST_MODEL_DEFAULT) +Common Joined RejectNegative Enum(vect_cost_model) Var(flag_vect_cost_model) Init(VECT_COST_MODEL_DEFAULT) Optimization Specifies the cost model for vectorization fsimd-cost-model= -Common Joined RejectNegative Enum(vect_cost_model) Var(flag_simd_cost_model) Init(VECT_COST_MODEL_UNLIMITED) +Common Joined RejectNegative Enum(vect_cost_model) Var(flag_simd_cost_model) Init(VECT_COST_MODEL_UNLIMITED) Optimization Specifies the vectorization cost model for code marked with a simd directive Enum @@ -2540,7 +2540,7 @@ Common Report Var(flag_tree_builtin_call_dce) Init(0) Optimization Enable conditional dead code elimination for builtin calls fwhole-program -Common Report Var(flag_whole_program) Init(0) Optimization +Common Report Var(flag_whole_program) Init(0) Perform whole program optimizations fwrapv diff --git a/gcc/ipa-icf.c b/gcc/ipa-icf.c index bbd5724a5e9..0ac01a9c3d0 100644 --- a/gcc/ipa-icf.c +++ b/gcc/ipa-icf.c @@ -1652,7 +1652,8 @@ sem_item_optimizer::filter_removed_items (void) { sem_item *item = m_items[i]; - if (!flag_ipa_icf_functions && item->type == FUNC) + if (item->type == FUNC + && !opt_for_fn (item->decl, flag_ipa_icf_functions)) { remove_item (item); continue; @@ -2499,7 +2500,7 @@ public: /* opt_pass methods: */ virtual bool gate (function *) { - return flag_ipa_icf_variables || flag_ipa_icf_functions; + return in_lto_p || flag_ipa_icf_variables || flag_ipa_icf_functions; } virtual unsigned int execute (function *) diff --git a/gcc/ipa-reference.c b/gcc/ipa-reference.c index 784c1df8d18..6a677ca502c 100644 --- a/gcc/ipa-reference.c +++ b/gcc/ipa-reference.c @@ -132,6 +132,9 @@ static splay_tree reference_vars_to_consider; static we are considering. This is added to the local info when asm code is found that clobbers all memory. */ static bitmap all_module_statics; +/* Set of all statics that should be ignored becuase they are touched by + -fno-ipa-reference code. */ +static bitmap ignore_module_statics; /* Obstack holding bitmaps of local analysis (live from analysis to propagation) */ @@ -198,6 +201,9 @@ set_reference_optimization_summary (struct cgraph_node *node, bitmap ipa_reference_get_not_read_global (struct cgraph_node *fn) { + if (!opt_for_fn (fn->decl, flag_ipa_reference) + || !opt_for_fn (current_function_decl, flag_ipa_reference)) + return NULL; ipa_reference_optimization_summary_t info = get_reference_optimization_summary (fn->function_symbol (NULL)); if (info) @@ -216,6 +222,9 @@ ipa_reference_get_not_read_global (struct cgraph_node *fn) bitmap ipa_reference_get_not_written_global (struct cgraph_node *fn) { + if (!opt_for_fn (fn->decl, flag_ipa_reference) + || !opt_for_fn (current_function_decl, flag_ipa_reference)) + return NULL; ipa_reference_optimization_summary_t info = get_reference_optimization_summary (fn); if (info) @@ -273,6 +282,8 @@ is_proper_for_analysis (tree t) return false; /* TODO: Check aliases. */ + if (bitmap_bit_p (ignore_module_statics, DECL_UID (t))) + return false; /* This is a variable we care about. Check if we have seen it before, and if not add it the set of variables we care about. */ @@ -381,8 +392,9 @@ propagate_bits (ipa_reference_global_vars_info_t x_global, struct cgraph_node *x /* Only look into nodes we can propagate something. */ int flags = flags_from_decl_or_type (y->decl); - if (avail > AVAIL_INTERPOSABLE - || (avail == AVAIL_INTERPOSABLE && (flags & ECF_LEAF))) + if (opt_for_fn (y->decl, flag_ipa_reference) + && (avail > AVAIL_INTERPOSABLE + || (avail == AVAIL_INTERPOSABLE && (flags & ECF_LEAF)))) { if (get_reference_vars_info (y)) { @@ -437,6 +449,7 @@ ipa_init (void) bitmap_obstack_initialize (&local_info_obstack); bitmap_obstack_initialize (&optimization_summary_obstack); all_module_statics = BITMAP_ALLOC (&optimization_summary_obstack); + ignore_module_statics = BITMAP_ALLOC (&optimization_summary_obstack); node_removal_hook_holder = symtab->add_cgraph_removal_hook (&remove_node_data, NULL); @@ -474,6 +487,8 @@ analyze_function (struct cgraph_node *fn) int i; tree var; + if (!opt_for_fn (fn->decl, flag_ipa_reference)) + return; local = init_function_info (fn); for (i = 0; fn->iterate_reference (i, ref); i++) { @@ -558,6 +573,22 @@ generate_summary (void) ipa_init (); /* Process all of the functions next. */ + FOR_EACH_DEFINED_FUNCTION (node) + if (!node->alias && !opt_for_fn (node->decl, flag_ipa_reference)) + { + struct ipa_ref *ref = NULL; + int i; + tree var; + for (i = 0; node->iterate_reference (i, ref); i++) + { + if (!is_a (ref->referred)) + continue; + var = ref->referred->decl; + if (!is_proper_for_analysis (var)) + continue; + bitmap_set_bit (ignore_module_statics, DECL_UID (var)); + } + } FOR_EACH_DEFINED_FUNCTION (node) analyze_function (node); @@ -570,7 +601,8 @@ generate_summary (void) if (dump_file) FOR_EACH_DEFINED_FUNCTION (node) - if (node->get_availability () >= AVAIL_INTERPOSABLE) + if (node->get_availability () >= AVAIL_INTERPOSABLE + && opt_for_fn (node->decl, flag_ipa_reference)) { ipa_reference_local_vars_info_t l; unsigned int index; @@ -607,7 +639,7 @@ read_write_all_from_decl (struct cgraph_node *node, tree decl = node->decl; int flags = flags_from_decl_or_type (decl); if ((flags & ECF_LEAF) - && node->get_availability () <= AVAIL_INTERPOSABLE) + && node->get_availability () < AVAIL_INTERPOSABLE) ; else if (flags & ECF_CONST) ; @@ -640,7 +672,8 @@ get_read_write_all_from_node (struct cgraph_node *node, struct cgraph_edge *e, *ie; /* When function is overwritable, we can not assume anything. */ - if (node->get_availability () <= AVAIL_INTERPOSABLE) + if (node->get_availability () <= AVAIL_INTERPOSABLE + || (node->analyzed && !opt_for_fn (node->decl, flag_ipa_reference))) read_write_all_from_decl (node, read_all, write_all); for (e = node->callees; @@ -650,7 +683,8 @@ get_read_write_all_from_node (struct cgraph_node *node, enum availability avail; struct cgraph_node *callee = e->callee->function_symbol (&avail); gcc_checking_assert (callee); - if (avail <= AVAIL_INTERPOSABLE) + if (avail <= AVAIL_INTERPOSABLE + || (callee->analyzed && !opt_for_fn (callee->decl, flag_ipa_reference))) read_write_all_from_decl (callee, read_all, write_all); } @@ -672,6 +706,18 @@ get_read_write_all_from_node (struct cgraph_node *node, } } +/* Skip edges from and to nodes without ipa_reference enables. This leave + them out of strongy connected coponents and makes them easyto skip in the + propagation loop bellow. */ + +static bool +ignore_edge_p (cgraph_edge *e) +{ + return (!opt_for_fn (e->caller->decl, flag_ipa_reference) + || !opt_for_fn (e->callee->function_symbol ()->decl, + flag_ipa_reference)); +} + /* Produce the global information by preforming a transitive closure on the local information that was produced by ipa_analyze_function. */ @@ -695,7 +741,7 @@ propagate (void) the global information. All the nodes within a cycle will have the same info so we collapse cycles first. Then we can do the propagation in one pass from the leaves to the roots. */ - order_pos = ipa_reduced_postorder (order, true, true, NULL); + order_pos = ipa_reduced_postorder (order, true, true, ignore_edge_p); if (dump_file) ipa_print_order (dump_file, "reduced", order, order_pos); @@ -710,7 +756,7 @@ propagate (void) bool write_all = false; node = order[i]; - if (node->alias) + if (node->alias || !opt_for_fn (node->decl, flag_ipa_reference)) continue; node_info = get_reference_vars_info (node); @@ -788,7 +834,7 @@ propagate (void) struct cgraph_node *w; node = order[i]; - if (node->alias) + if (node->alias || !opt_for_fn (node->decl, flag_ipa_reference)) continue; fprintf (dump_file, @@ -829,7 +875,7 @@ propagate (void) ipa_reference_optimization_summary_t opt; node_info = get_reference_vars_info (node); - if (!node->alias + if (!node->alias && opt_for_fn (node->decl, flag_ipa_reference) && (node->get_availability () > AVAIL_INTERPOSABLE || (flags_from_decl_or_type (node->decl) & ECF_LEAF))) { @@ -1178,7 +1224,7 @@ public: /* opt_pass methods: */ virtual bool gate (function *) { - return (flag_ipa_reference + return ((in_lto_p || flag_ipa_reference) /* Don't bother doing anything if the program has errors. */ && !seen_error ()); } diff --git a/gcc/optc-save-gen.awk b/gcc/optc-save-gen.awk index 58732c04acd..2509699bf3a 100644 --- a/gcc/optc-save-gen.awk +++ b/gcc/optc-save-gen.awk @@ -84,15 +84,17 @@ print "void"; print "cl_optimization_save (struct cl_optimization *ptr, struct gcc_options *opts)"; print "{"; -n_opt_char = 2; +n_opt_char = 3; n_opt_short = 0; n_opt_int = 0; n_opt_enum = 1; n_opt_other = 0; var_opt_char[0] = "optimize"; var_opt_char[1] = "optimize_size"; +var_opt_char[2] = "optimize_debug"; var_opt_range["optimize"] = "0, 255"; -var_opt_range["optimize_size"] = "0, 255"; +var_opt_range["optimize_size"] = "0, 1"; +var_opt_range["optimize_debug"] = "0, 1"; var_opt_enum[0] = "flag_fp_contract_mode"; # Sort by size to mimic how the structure is laid out to be friendlier to the @@ -734,11 +736,13 @@ for (i = 0; i < n_target_val; i++) { print "}"; -n_opt_val = 2; +n_opt_val = 3; var_opt_val[0] = "x_optimize" var_opt_val_type[0] = "char " var_opt_val[1] = "x_optimize_size" +var_opt_val[2] = "x_optimize_debug" var_opt_val_type[1] = "char " +var_opt_val_type[2] = "char " for (i = 0; i < n_opts; i++) { if (flag_set_p("Optimization", flags[i])) { name = var_name(flags[i]) diff --git a/gcc/opth-gen.awk b/gcc/opth-gen.awk index bcb0a957eb2..473932b2ecc 100644 --- a/gcc/opth-gen.awk +++ b/gcc/opth-gen.awk @@ -132,13 +132,14 @@ print "/* Structure to save/restore optimization and target specific options. * print "struct GTY(()) cl_optimization"; print "{"; -n_opt_char = 2; +n_opt_char = 3; n_opt_short = 0; n_opt_int = 0; n_opt_enum = 1; n_opt_other = 0; var_opt_char[0] = "unsigned char x_optimize"; var_opt_char[1] = "unsigned char x_optimize_size"; +var_opt_char[2] = "unsigned char x_optimize_debug"; var_opt_enum[0] = "enum fp_contract_mode x_flag_fp_contract_mode"; for (i = 0; i < n_opts; i++) { diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index e6972b8f4f4..801d87ebfc6 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,12 @@ +2015-01-18 Jan Hubicka + + * gcc.dg/ipa/ipa-icf-32.c: Update template. + * c-c++-common/asan/instrument-with-calls-3.c: Likewise. + * c-c++-common/asan/instrument-with-calls-2.c: Likewise. + * c-c++-common/asan/instrument-with-calls-1.c: Likewise. + * c-c++-common/asan/kasan-recover-1.c: Likewise. + * c-c++-common/asan/kasan-recover-2.c: Likewise. + 2015-01-18 Jan Hubicka PR ipa/64378 diff --git a/gcc/testsuite/c-c++-common/asan/instrument-with-calls-1.c b/gcc/testsuite/c-c++-common/asan/instrument-with-calls-1.c index a08b98a47db..7b55c2e5857 100644 --- a/gcc/testsuite/c-c++-common/asan/instrument-with-calls-1.c +++ b/gcc/testsuite/c-c++-common/asan/instrument-with-calls-1.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "--param asan-instrumentation-with-call-threshold=0" } */ +/* { dg-options "--param asan-instrumentation-with-call-threshold=0 -ffat-lto-objects" } */ void f(char *a, int *b) { *b = *a; diff --git a/gcc/testsuite/c-c++-common/asan/instrument-with-calls-2.c b/gcc/testsuite/c-c++-common/asan/instrument-with-calls-2.c index 217410c32be..efb481bab12 100644 --- a/gcc/testsuite/c-c++-common/asan/instrument-with-calls-2.c +++ b/gcc/testsuite/c-c++-common/asan/instrument-with-calls-2.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "--param asan-instrumentation-with-call-threshold=1" } */ +/* { dg-options "--param asan-instrumentation-with-call-threshold=1 -ffat-lto-objects" } */ int x; diff --git a/gcc/testsuite/c-c++-common/asan/instrument-with-calls-3.c b/gcc/testsuite/c-c++-common/asan/instrument-with-calls-3.c index 6dbd54951db..42033f1cab9 100644 --- a/gcc/testsuite/c-c++-common/asan/instrument-with-calls-3.c +++ b/gcc/testsuite/c-c++-common/asan/instrument-with-calls-3.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "--param asan-instrumentation-with-call-threshold=0" } */ +/* { dg-options "--param asan-instrumentation-with-call-threshold=0 -ffat-lto-objects" } */ struct A { char x[7]; diff --git a/gcc/testsuite/c-c++-common/asan/kasan-recover-1.c b/gcc/testsuite/c-c++-common/asan/kasan-recover-1.c index b7d3dda9f7d..356d50a0d59 100644 --- a/gcc/testsuite/c-c++-common/asan/kasan-recover-1.c +++ b/gcc/testsuite/c-c++-common/asan/kasan-recover-1.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-fno-sanitize=address -fsanitize=kernel-address --param asan-instrumentation-with-call-threshold=100" } */ +/* { dg-options "-fno-sanitize=address -fsanitize=kernel-address --param asan-instrumentation-with-call-threshold=100 -ffat-lto-objects" } */ void foo (int *p) diff --git a/gcc/testsuite/c-c++-common/asan/kasan-recover-2.c b/gcc/testsuite/c-c++-common/asan/kasan-recover-2.c index 03f29c1ff62..d9655470abe 100644 --- a/gcc/testsuite/c-c++-common/asan/kasan-recover-2.c +++ b/gcc/testsuite/c-c++-common/asan/kasan-recover-2.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-fno-sanitize=address -fsanitize=kernel-address" } */ +/* { dg-options "-fno-sanitize=address -fsanitize=kernel-address -ffat-lto-objects" } */ void foo (int *p) diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-icf-32.c b/gcc/testsuite/gcc.dg/ipa/ipa-icf-32.c index 22544a70d46..55ab086cd50 100644 --- a/gcc/testsuite/gcc.dg/ipa/ipa-icf-32.c +++ b/gcc/testsuite/gcc.dg/ipa/ipa-icf-32.c @@ -1,8 +1,8 @@ /* { dg-do run } */ -/* { dg-options "-O0 -fipa-icf -fdump-ipa-icf-details" } */ +/* { dg-options "-O1 -fipa-icf -fdump-ipa-icf-details" } */ int -__attribute__((optimize("O0"), noinline, noclone)) +__attribute__((optimize("Os"), noinline, noclone)) foo(int a) { return a * a; -- 2.30.2