procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

c-family: Fix option check in handle_pragma_diagnostic [PR106252]

Browse source 
In r13-1544, handle_pragma_diagnostic was refactored to support processing
early pragmas. During that process the part looking up option arguments was
inadvertenly moved too early, prior to checking the option was valid, causing
PR106252. Fixed by moving the check back where it goes.

gcc/c-family/ChangeLog:

	PR preprocessor/106252
	* c-pragma.cc (handle_pragma_diagnostic_impl): Don't look up the
	option argument prior to verifying the option was found.
This commit is contained in:
Lewis Hyatt 2022-07-11 08:12:33 -04:00
parent f1782a0a8c
commit cb7b01db7a
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gcc/c-family/c-pragma.cc
View file

@ -1009,10 +1009,6 @@ handle_pragma_diagnostic_impl ()
if (early && !c_option_is_from_cpp_diagnostics (option_index))
return;
const char *arg = NULL;
if (cl_options[option_index].flags & CL_JOINED)
arg = data.option_str + 1 + cl_options[option_index].opt_len;
if (option_index == OPT_SPECIAL_unknown)
{
if (want_diagnostics)
@ -1052,6 +1048,10 @@ handle_pragma_diagnostic_impl ()
return;
}
const char *arg = NULL;
if (cl_options[option_index].flags & CL_JOINED)
arg = data.option_str + 1 + cl_options[option_index].opt_len;
struct cl_option_handlers handlers;
set_default_handlers (&handlers, NULL);
/* FIXME: input_location isn't the best location here, but it is