Split up init_options langhook

In <http://gcc.gnu.org/ml/gcc-patches/2010-06/msg01856.html>, which is
pending review, I noted that the front-end init_options hooks still
took argc and argv parameters, contrary to the general principle of
converting argv into an array of cl_decoded_option structures with
logic in a single place and not referring directly to argc and argc
elsewhere.

This patch (relative to a tree with the previous patch applied)
updates the hooks so that the init_options hooks instead take decoded
options.  The lang_mask used for decoding is determined first by a
separate option_lang_mask hook; wrong-language options for
preprocessing .S files are now handled not through changing the mask
for -lang-asm but through a complain_wrong_lang_p hook to decide
whether to warn for such options, which also avoids a special case for
LTO in the core option-processing code.  Some C init_options code that
was actually diagnostic initialization is now called from the hook to
initialize diagnostics, which seems a more appropriate place.

Ada does complicated things with the original argv and argc, which it
saved in the init_options hook, as well as putting canonical forms of
various options in gnat_argv/gnat_argc in gnat_handle_option.  I'm not
clear on exactly what use it makes of each of the arrays save_argv and
gnat_argv.  With the change to init_options no longer getting argc and
argv, gnat_init_options now reconstitutes a save_argv array from the
decoded options it is passed.  I'd urge the Ada maintainers to work
out how to stop the front end from using save_argv/save_argc at all;
expecting the front end to replicate exactly the core logic for what
is an option and what is an argument is very error-prone; whatever it
needs to do should be done based on logical, decoded options instead
(option indices and arguments).  (The gnat_argv approach in
gnat_handle_option is probably safer since that only handles a very
limited subset of options and reconstitutes text based purely on
options indices and arguments with no reference to the original form
of an option or to options it does not know explicitly about.)

To enable reconstitution of options, a new field in cl_decoded_option
is added to store a canonical command-line form of an option.  Right
now this is the original form, but the "canonical" aspect will become
more relevant in future when support for option aliases is added to
the option-processing machinery.  This field was planned for when the
driver started using the common option machinery - the driver needs to
reconstitute options to process specs - but is being added earlier
than planned so that options can be reconstituted for Ada, so that the
langhooks changes can be made without also needing to fix the uses of
argv made in Ada code.

Bootstrapped with no regressions on x86_64-unknown-linux-gnu.  OK to
commit (both <http://gcc.gnu.org/ml/gcc-patches/2010-06/msg01856.html>
and this patch)?

2010-06-20  Joseph Myers  <joseph@codesourcery.com>

	* langhooks-def.h (lhd_init_options, LANG_HOOKS_OPTION_LANG_MASK,
	LANG_HOOKS_COMPLAIN_WRONG_LANG_P): New.
	(LANG_HOOKS_INIT_OPTIONS): Update default definition.
	(LANG_HOOKS_INITIALIZER): Add new hooks.
	* langhooks.c (lhd_init_options, lhd_complain_wrong_lang_p): New.
	* langhooks.h (struct lang_hooks): Add new hooks option_lang_mask
	and complain_wrong_lang_p.  Update init_options prototype.
	* c-objc-common.c (c_initialize_diagnostics): First call
	c_common_initialize_diagnostics.
	* c-objc-common.h (LANG_HOOKS_OPTION_LANG_MASK,
	LANG_HOOKS_COMPLAIN_WRONG_LANG_P): Define.
	* coretypes.h (struct cl_option, struct cl_decoded_option):
	Declare.
	* hooks.c (hook_uint_uint_constcharptrptr_0): Remove.
	(hook_uint_void_0): New.
	* hooks.h (hook_uint_uint_constcharptrptr_0): Remove.
	(hook_uint_void_0): New.
	* opts-common.c (decode_cmdline_option,
	decode_cmdline_options_to_array): Also fill in canonical_option
	field.
	* opts.c (complain_wrong_lang): Use langhook to determine whether
	to complain instead of special-casing LTO.
	(decode_options): Separate lang_mask determination with
	option_lang_mask hook from call of init_options hook.
	* opts.h (struct cl_decoded_option): Add canonical_option.

ada:
2010-06-20  Joseph Myers  <joseph@codesourcery.com>

	* gcc-interface/misc.c (gnat_option_lang_mask): New.
	(gnat_init_options): Update prototype.  Reconstruct argv array
	from decoded options.

c-family:
2010-06-20  Joseph Myers  <joseph@codesourcery.com>

	* c-common.h (c_common_option_lang_mask,
	c_common_initialize_diagnostics, c_common_complain_wrong_lang_p):
	New.
	(c_common_init_options): Update prototype.
	* c-opts.c (c_common_option_lang_mask): New.
	(c_common_initialize_diagnostics): Split out of
	c_common_init_options.
	(accept_all_c_family_options, c_common_complain_wrong_lang_p):
	New.
	(c_common_init_options): Update prototype.  Use decoded options in
	search for -lang-asm.

cp:
2010-06-20  Joseph Myers  <joseph@codesourcery.com>

	* cp-objcp-common.c (cxx_initialize_diagnostics): First call
	c_common_initialize_diagnostics.
	* cp-objcp-common.h (LANG_HOOKS_OPTION_LANG_MASK,
	LANG_HOOKS_COMPLAIN_WRONG_LANG_P): Define.

fortran:
2010-06-20  Joseph Myers  <joseph@codesourcery.com>

	* cpp.c (gfc_cpp_init_options): Update prototype.  Use number of
	decoded options in allocating deferred_opt.
	* cpp.h (gfc_cpp_init_options): Update prototype.
	* f95-lang.c (LANG_HOOKS_OPTION_LANG_MASK): Define.
	* gfortran.h (gfc_option_lang_mask): New.
	(gfc_init_options): Update prototype.
	* options.c (gfc_option_lang_mask): New.
	(gfc_init_options): Update prototype.  Pass new arguments to
	gfc_cpp_init_options.

java:
2010-06-20  Joseph Myers  <joseph@codesourcery.com>

	* lang.c (java_option_lang_mask): New.
	(java_init_options): Update prototype.
	(LANG_HOOKS_OPTION_LANG_MASK): Define.

lto:
2010-06-20  Joseph Myers  <joseph@codesourcery.com>

	* lto-lang.c (lto_option_lang_mask, lto_complain_wrong_lang_p):
	New.
	(lto_init_options): Update prototype.
	(LANG_HOOKS_OPTION_LANG_MASK, LANG_HOOKS_COMPLAIN_WRONG_LANG_P):
	Define.

Split up init_options langhook

Commit Message

Comments

Patch