[4/6] Handwritten part of conversion of passes to instances of C++ classes

This is the hand-written part of the patch; it is required for the
	preceding auto-generated patch to make sense.

	* context.h: New file: introducing a context class to hold global
	state, with a "the_ctxt" singleton.
	* pipeline.h: New file: defines a new "class pipeline", to hold the
	pass hierarchy, with a field per pass, and with fields to replace
	various globals within passes.c as listed below
	* toplev.c (the_ctxt): define the singleton the_ctxt in this file
	* passes.def (NEXT_PASS_IDX): introduce new macro NEXT_PASS_IDX for
	use any time a pass is reused, giving a unique index, so that the
	fields in the pipeline class have unique names.
	* tree-pass.h (required): add helper struct so that various property
	and todo flags can be self-documenting
	(provided): likewise
	(destroyed): likewise
	(start): likewise
	(finish): likewise
	(pass_properties): introduce a new struct pass_properties to group
	the three fields required, provided, destroyed within opt_pass
	(pass_todo_flags): similarly for the todo_start, todo_finish fields
	(opt_pass): convert struct opt_pass to a class opt_pass.  Replace
	the gate and execute callbacks with pairs of C++ virtual functions:
	one to check for the presence of a hook, and another to implement
	the hook, since there are numerous places in the existing code
	guarded by a test against the function pointer being non-NULL.  Add
	a reference to the context instance as member data to the opt_pass,
	to make it easier to have multiple sets of global GCC state within
	a process.
	(gimple_opt_pass): convert struct gimple_opt_pass into a C++ class,
	derived from opt_pass
	(rtl_opt_pass): ditto
	(simple_ipa_opt_pass): ditto
	(ipa_opt_pass_d): ditto, splitting the various function pointer
	hooks into has_ and impl_ virtual functions as per opt_pass
	(gcc_pass_lists): eliminate this global
	(get_pass_for_id): eliminate this function in favor of a member
	function of class pipeline with the same name
	(passes_by_id): eliminate this function in favor of a field of class
	pipeline with the same name
	(passes_by_id_size): ditto
	(all_passes): remove this global, it is now a field within class
	pipeline
	(all_small_ipa_passes): ditto
	(all_lowering_passes): ditto
	(all_regular_ipa_passes): ditto
	(all_late_ipa_passes): ditto
	(all_lto_gen_passes): ditto
	* passes.c (init_optimization_passes): Create the_ctxt.passes.
	Redefine the pass-creation macros for passes.def so that they
	populate the fields of the_ctxt.passes, rather than setting global
	variables; use the_ctxt.passes when accessing the pass lists.
	(dump_passes): Get at the pass lists as fields of the_ctxt.passes
	instance of "pipeline", rather than them being globals
	(register_pass): ditto
	(ipa_write_optimization_summaries): ditto
	(ipa_write_summaries_1): ditto
	(ipa_read_summaries): ditto
	(ipa_read_optimization_summaries): ditto
	(execute_all_ipa_stmt_fixups): ditto
	(finish_optimization_passes): no longer need to access
	.pass to get at static_pass_number; lookup passes by the_ctxt.passes
	(all_passes): remove this global, it is now a field within class
	pipeline
	(all_small_ipa_passes): ditto
	(all_lowering_passes): ditto
	(all_regular_ipa_passes): ditto
	(all_late_ipa_passes): ditto
	(all_lto_gen_passes): ditto
	(gcc_pass_lists): eliminate this global
	(passes_by_id): remove this global, it is now a field within class
	pipeline
	(passes_by_id_size): ditto
	(set_pass_for_id): rename to pipeline::set_pass_for_id
	(get_pass_for_id): rename to pipeline::get_pass_for_id
	(register_one_dump_file): set_pass_for_id is now a method of
	pipeline
	(register_dump_files_1): update for change from pass->properties_*
	fields to pass->props struct and for pass->gate != NULL to
	pass->has_gate ()
	(register_dump_files): update for change from pass->properties_*
	fields to pass->props struct
	(create_pass_tab): passes_by_id_size is now a field of class
	pipeline
	(dump_one_pass): opt_pass->gate is now a C++ member function
	(make_pass_instance): replace todo_flags_* with fields of
	todo_flags struct
	(position_pass): ditto
	(check_profile_consistency): passes_by_id_size is now a field of
	class pipeline
	(dump_profile_report): ditto; likewise for passes_by_id; access
	pass_expand via the_ctxt.passes rather than as a global; no longer
	need to access .pass to get at static_pass_number
	(update_properties_after_pass): update for change from
	pass->properties_* fields to pass->props struct
	(execute_ipa_summary_passes): no longer need to access .pass to
	cast to an opt_pass; eliminate redundant !pass->gate test; convert
	ipa_pass->generate_summary test to call to
	ipa_pass->has_generate_summary(); convert ipa_pass->generate_summary
	call to ipa_pass->impl_generate_summary
	(execute_one_ipa_transform_pass): no longer need to access .pass to
	cast to an opt_pass; replace ipa_pass->function_transform test with
	call to ipa_pass->has_function_transform; replace call to
	ipa_pass->generate_summary with one to
	ipa_pass->impl_generate_summary
	(execute_one_pass): remove redundant test against pass->gate;
	replace todo_flags_* with fields of todo_flags struct; update for
	change from pass->properties_* fields to pass->props struct;
	replace test against pass->execute != NULL with call to
	pass->has_execute; replace call to pass->execute with call to
	impl_execute
	(ipa_write_summaries_2): replace call to ipa_pass->write_summary
	with call to ipa_pass->impl_write_summary
	(ipa_write_optimization_summaries_1): replace call to
	ipa_pass->write_optimization_summary with call to
	ipa_pass->impl_write_optimization_summary
	(ipa_read_summaries_1): eliminate redundant pass->gate == NULL test;
	convert ipa_pass->read_summary != NULL test into a call to
	ipa_pass->has_read_summary; convert call to ipa_pass->read_summary
	into ipa_pass->impl_read_summary
	(ipa_read_optimization_summaries_1): likewise for
	"read_optimization_summary"
	(execute_ipa_stmt_fixups): likewise for "stmt_fixup"
	* cgraphunit.c (cgraph_process_new_functions): Use the_ctxt.passes
	when accessing the pass lists.
	(cgraph_add_new_function): likewise
	(cgraph_analyze_function): likewise
	(expand_function): likewise
	(ipa_passes): likewise
	(compile): likewise
	* config/i386/i386.c (rest_of_handle_insert_vzeroupper): Use
	the_ctxt.passes when locating pass_mode_switching
	(ix86_option_override): Invoke factory function to make an instance
	of pass_insert_vzeroupper.
	* lto-cgraph.c (lto_output_node): now that passes are C++ classes
	we no longer need to access .pass to get at static_pass_number
	(input_node): Use the_ctxt.passes when looking up a pass by id
	* lto/lto.c (read_cgraph_and_symbols): Use
	the_ctxt.passes when locating pass_ipa_inline
	(do_whole_program_analysis): Use
	the_ctxt.passes when locating all_regular_ipa_passes
	* statistics.c (statistics_fini): get_pass_for_id is now a method of
	class pipeline
	* testsuite/g++.dg/plugin/dumb_plugin.c (plugin_init): Update pass
	registration to reflect the automated refactor.py patch, so that it
	calls the pass creation function (rather than relying on a single
	global instance of the pass).
	* testsuite/g++.dg/plugin/selfassign.c (plugin_init): likewise
	* testsuite/gcc.dg/plugin/one_time_plugin.c (plugin_init): likewise
	* testsuite/gcc.dg/plugin/selfassign.c (plugin_init): likewise
---
 gcc/ChangeLog                                 | 153 ++++++++++++++++
 gcc/cgraphunit.c                              |  32 ++--
 gcc/config/i386/i386.c                        |  10 +-
 gcc/context.h                                 |  35 ++++
 gcc/lto-cgraph.c                              |   9 +-
 gcc/lto/lto.c                                 |   6 +-
 gcc/passes.c                                  | 222 +++++++++++++----------
 gcc/passes.def                                | 165 ++++++++---------
 gcc/pipeline.h                                |  71 ++++++++
 gcc/statistics.c                              |   8 +-
 gcc/testsuite/g++.dg/plugin/dumb_plugin.c     |   3 +-
 gcc/testsuite/g++.dg/plugin/selfassign.c      |   3 +-
 gcc/testsuite/gcc.dg/plugin/one_time_plugin.c |   3 +-
 gcc/testsuite/gcc.dg/plugin/selfassign.c      |   3 +-
 gcc/toplev.c                                  |   4 +
 gcc/tree-pass.h                               | 249 +++++++++++++++++++++-----
 16 files changed, 724 insertions(+), 252 deletions(-)
 create mode 100644 gcc/context.h
 create mode 100644 gcc/pipeline.h

[4/6] Handwritten part of conversion of passes to instances of C++ classes

Commit Message

Comments

Patch