diff options
author | Trevor Saunders <tsaunders@mozilla.com> | 2014-04-17 12:37:34 +0000 |
---|---|---|
committer | Trevor Saunders <tbsaunde@gcc.gnu.org> | 2014-04-17 12:37:34 +0000 |
commit | be55bfe6cf456943b12fe128f8a445b583ace36f (patch) | |
tree | 2c7de59d1f6572c580defbe0ccac2d0b83cd1eb3 /gcc/tree-cfg.c | |
parent | 1a3d085cf2a0caa5daef7c0443b1d280bcef295e (diff) | |
download | gcc-be55bfe6cf456943b12fe128f8a445b583ace36f.zip gcc-be55bfe6cf456943b12fe128f8a445b583ace36f.tar.gz gcc-be55bfe6cf456943b12fe128f8a445b583ace36f.tar.bz2 |
pass cfun to pass::execute
gcc/
* passes.c (opt_pass::execute): Adjust.
(pass_manager::execute_pass_mode_switching): Likewise.
(early_local_passes::execute): Likewise.
(execute_one_pass): Pass cfun to the pass's execute method.
* tree-pass.h (opt_pass::execute): Add function * argument.
* asan.c, auto-inc-dec.c, bb-reorder.c, bt-load.c, cfgcleanup.c,
cfgexpand.c, cfgrtl.c, cgraphbuild.c, combine-stack-adj.c, combine.c,
compare-elim.c, config/arc/arc.c, config/epiphany/mode-switch-use.c,
config/epiphany/resolve-sw-modes.c, config/i386/i386.c,
config/mips/mips.c, config/rl78/rl78.c, config/s390/s390.c,
config/sparc/sparc.c, cprop.c, dce.c, df-core.c, dse.c, dwarf2cfi.c,
except.c, final.c, function.c, fwprop.c, gcse.c, gimple-low.c,
gimple-ssa-isolate-paths.c, gimple-ssa-strength-reduction.c,
graphite.c, ifcvt.c, init-regs.c, ipa-cp.c, ipa-devirt.c,
ipa-inline-analysis.c, ipa-inline.c, ipa-profile.c, ipa-pure-const.c,
ipa-reference.c, ipa-split.c, ipa.c, ira.c, jump.c, loop-init.c,
lower-subreg.c, mode-switching.c, omp-low.c, postreload-gcse.c,
postreload.c, predict.c, recog.c, ree.c, reg-stack.c, regcprop.c,
reginfo.c, regrename.c, reorg.c, sched-rgn.c, stack-ptr-mod.c,
store-motion.c, tracer.c, trans-mem.c, tree-call-cdce.c, tree-cfg.c,
tree-cfgcleanup.c, tree-complex.c, tree-eh.c, tree-emutls.c,
tree-if-conv.c, tree-into-ssa.c, tree-loop-distribution.c, tree-nrv.c,
tree-object-size.c, tree-parloops.c, tree-predcom.c, tree-ssa-ccp.c,
tree-ssa-copy.c, tree-ssa-copyrename.c, tree-ssa-dce.c,
tree-ssa-dom.c, tree-ssa-dse.c, tree-ssa-forwprop.c,
tree-ssa-ifcombine.c, tree-ssa-loop-ch.c, tree-ssa-loop-im.c,
tree-ssa-loop-ivcanon.c, tree-ssa-loop-prefetch.c,
tree-ssa-loop-unswitch.c, tree-ssa-loop.c, tree-ssa-math-opts.c,
tree-ssa-phiopt.c, tree-ssa-phiprop.c, tree-ssa-pre.c,
tree-ssa-reassoc.c, tree-ssa-sink.c, tree-ssa-strlen.c,
tree-ssa-structalias.c, tree-ssa-uncprop.c, tree-ssa-uninit.c,
tree-ssa.c, tree-ssanames.c, tree-stdarg.c, tree-switch-conversion.c,
tree-tailcall.c, tree-vect-generic.c, tree-vectorizer.c, tree-vrp.c,
tree.c, tsan.c, ubsan.c, var-tracking.c, vtable-verify.c, web.c:
Adjust.
From-SVN: r209482
Diffstat (limited to 'gcc/tree-cfg.c')
-rw-r--r-- | gcc/tree-cfg.c | 136 |
1 files changed, 66 insertions, 70 deletions
diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c index 8fcaae8..0fb2681 100644 --- a/gcc/tree-cfg.c +++ b/gcc/tree-cfg.c @@ -368,7 +368,7 @@ public: {} /* opt_pass methods: */ - unsigned int execute () { return execute_build_cfg (); } + virtual unsigned int execute (function *) { return execute_build_cfg (); } }; // class pass_build_cfg @@ -8100,7 +8100,7 @@ public: {} /* opt_pass methods: */ - unsigned int execute () { return split_critical_edges (); } + virtual unsigned int execute (function *) { return split_critical_edges (); } opt_pass * clone () { return new pass_split_crit_edges (m_ctxt); } }; // class pass_split_crit_edges @@ -8165,64 +8165,6 @@ gimplify_build1 (gimple_stmt_iterator *gsi, enum tree_code code, tree type, -/* Emit return warnings. */ - -static unsigned int -execute_warn_function_return (void) -{ - source_location location; - gimple last; - edge e; - edge_iterator ei; - - if (!targetm.warn_func_return (cfun->decl)) - return 0; - - /* If we have a path to EXIT, then we do return. */ - if (TREE_THIS_VOLATILE (cfun->decl) - && EDGE_COUNT (EXIT_BLOCK_PTR_FOR_FN (cfun)->preds) > 0) - { - location = UNKNOWN_LOCATION; - FOR_EACH_EDGE (e, ei, EXIT_BLOCK_PTR_FOR_FN (cfun)->preds) - { - last = last_stmt (e->src); - if ((gimple_code (last) == GIMPLE_RETURN - || gimple_call_builtin_p (last, BUILT_IN_RETURN)) - && (location = gimple_location (last)) != UNKNOWN_LOCATION) - break; - } - if (location == UNKNOWN_LOCATION) - location = cfun->function_end_locus; - warning_at (location, 0, "%<noreturn%> function does return"); - } - - /* If we see "return;" in some basic block, then we do reach the end - without returning a value. */ - else if (warn_return_type - && !TREE_NO_WARNING (cfun->decl) - && EDGE_COUNT (EXIT_BLOCK_PTR_FOR_FN (cfun)->preds) > 0 - && !VOID_TYPE_P (TREE_TYPE (TREE_TYPE (cfun->decl)))) - { - FOR_EACH_EDGE (e, ei, EXIT_BLOCK_PTR_FOR_FN (cfun)->preds) - { - gimple last = last_stmt (e->src); - if (gimple_code (last) == GIMPLE_RETURN - && gimple_return_retval (last) == NULL - && !gimple_no_warning_p (last)) - { - location = gimple_location (last); - if (location == UNKNOWN_LOCATION) - location = cfun->function_end_locus; - warning_at (location, OPT_Wreturn_type, "control reaches end of non-void function"); - TREE_NO_WARNING (cfun->decl) = 1; - break; - } - } - } - return 0; -} - - /* Given a basic block B which ends with a conditional and has precisely two successors, determine which of the edges is taken if the conditional is true and which is taken if the conditional is @@ -8247,6 +8189,8 @@ extract_true_false_edges_from_block (basic_block b, } } +/* Emit return warnings. */ + namespace { const pass_data pass_data_warn_function_return = @@ -8271,10 +8215,65 @@ public: {} /* opt_pass methods: */ - unsigned int execute () { return execute_warn_function_return (); } + virtual unsigned int execute (function *); }; // class pass_warn_function_return +unsigned int +pass_warn_function_return::execute (function *fun) +{ + source_location location; + gimple last; + edge e; + edge_iterator ei; + + if (!targetm.warn_func_return (fun->decl)) + return 0; + + /* If we have a path to EXIT, then we do return. */ + if (TREE_THIS_VOLATILE (fun->decl) + && EDGE_COUNT (EXIT_BLOCK_PTR_FOR_FN (fun)->preds) > 0) + { + location = UNKNOWN_LOCATION; + FOR_EACH_EDGE (e, ei, EXIT_BLOCK_PTR_FOR_FN (fun)->preds) + { + last = last_stmt (e->src); + if ((gimple_code (last) == GIMPLE_RETURN + || gimple_call_builtin_p (last, BUILT_IN_RETURN)) + && (location = gimple_location (last)) != UNKNOWN_LOCATION) + break; + } + if (location == UNKNOWN_LOCATION) + location = cfun->function_end_locus; + warning_at (location, 0, "%<noreturn%> function does return"); + } + + /* If we see "return;" in some basic block, then we do reach the end + without returning a value. */ + else if (warn_return_type + && !TREE_NO_WARNING (fun->decl) + && EDGE_COUNT (EXIT_BLOCK_PTR_FOR_FN (fun)->preds) > 0 + && !VOID_TYPE_P (TREE_TYPE (TREE_TYPE (fun->decl)))) + { + FOR_EACH_EDGE (e, ei, EXIT_BLOCK_PTR_FOR_FN (fun)->preds) + { + gimple last = last_stmt (e->src); + if (gimple_code (last) == GIMPLE_RETURN + && gimple_return_retval (last) == NULL + && !gimple_no_warning_p (last)) + { + location = gimple_location (last); + if (location == UNKNOWN_LOCATION) + location = fun->function_end_locus; + warning_at (location, OPT_Wreturn_type, "control reaches end of non-void function"); + TREE_NO_WARNING (fun->decl) = 1; + break; + } + } + } + return 0; +} + } // anon namespace gimple_opt_pass * @@ -8348,13 +8347,6 @@ do_warn_unused_result (gimple_seq seq) } } -static unsigned int -run_warn_unused_result (void) -{ - do_warn_unused_result (gimple_body (current_function_decl)); - return 0; -} - namespace { const pass_data pass_data_warn_unused_result = @@ -8380,7 +8372,11 @@ public: /* opt_pass methods: */ virtual bool gate (function *) { return flag_warn_unused_result; } - unsigned int execute () { return run_warn_unused_result (); } + virtual unsigned int execute (function *) + { + do_warn_unused_result (gimple_body (current_function_decl)); + return 0; + } }; // class pass_warn_unused_result @@ -8522,7 +8518,7 @@ public: /* opt_pass methods: */ opt_pass * clone () { return new pass_fixup_cfg (m_ctxt); } - unsigned int execute () { return execute_fixup_cfg (); } + virtual unsigned int execute (function *) { return execute_fixup_cfg (); } }; // class pass_fixup_cfg |