PR preprocessor/7263 - Avoid pedantic warnings on system headers macro tokens

Jason Merrill <jason@redhat.com> writes:

> It seems like for most of the declspecs, having both the location and
> a flag/count is unnecessary; instead of checking the flag, we can
> check whether the location is set.  That won't work for the "long long
> long" check, but it should work for the others.  You'll need to change
> _check_decl_spec to take the new declspec and location rather than
> have it iterate every time, but that seems worth doing anyway.
>
> So I don't think we need both cp_decl_spec and cp_decl_spec_word.

OK.  I have done this.

I have removed cp_parser_check_decl_spec completely, and instead,
introduced a new function set_and_check_decl_spec_loc that sets the
location for a given decl spec, and does the check there.  I hope this
does what you had in mind.

>
>>        error_at (location, "%<__thread%> before %qD", ridpointers[keyword]);
>>        decl_specs->specs[(int) ds_thread] = 0;
>> +      decl_specs->locations[cpdw_thread] = location;
>
> This error should use the stored __thread location, and then set it to
> 0 rather than the location argument.

Oops, right.  Fixed.

>
>> +      decl_specs->locations[cpdw_builtin_type_spec] = location;
>>        if (!decl_specs->type)
>>  	{
>>  	  decl_specs->type = type_spec;
>>  	  decl_specs->type_definition_p = false;
>> -	  decl_specs->type_location = location;
>> +	  decl_specs->locations[cpdw_type_spec] = location;
>
> Why do we need cpdw_builtin_type_spec?

[... ]

> I agree that cpdw_type_spec makes sense.  I just don't see why we need
> the _builtin_ variant.

Oops.  My bad.  I didn't finish what I wanted to do.

I wanted to be able to use the precise location of the redefined type
when we permerror about that redefinition, in check_tag_decl.

Finished in the patch below.

Is it a bit better?

Bootstrapped and tested on x86_64-unknown-linux-gnu against trunk.

Thanks.

libcpp/

	PR preprocessor/7263
	* include/cpplib.h (cpp_classify_number): Take a location
	parameter.
	* expr.c (SYNTAX_ERROR_AT, SYNTAX_ERROR2_AT): New diagnostic
	macros that take a location parameter.
	(cpp_classify_number): Take a (virtual) location parameter.  Use
	it for diagnostics.  Adjust comments.
	(eval_token): Take a location parameter.  Pass it to
	cpp_classify_number and to diagnostic routines.
	(_cpp_parse_expr): Use virtual locations of tokens when parsing
	expressions.  Pass a virtual location to eval_token and to
	diagnostic routines.

gcc/c-family/

	PR preprocessor/7263
	* c-lex.c (c_lex_with_flags):  Pass a virtual location to the call
	to cpp_classify_number.  For diagnostics, use the precise location
	instead of the global input_location.

gcc/
	PR preprocessor/7263
	* c-tree.h (enum c_declspec_word): Declare new enum.
	(struct c_declspecs::locations): New member.
	(declspecs_add_qual, declspecs_add_scspec)
	(declspecs_add_addrspace, declspecs_add_alignas): Take a new
	location parameter.
	* c-decl.c (build_null_declspecs): Initialize the new struct
	c_declspecs::locations member.
	(declspecs_add_addrspace): Take a location parameter for the
	address space.  Store it onto declaration specifiers.
	(declspecs_add_qual): Likewise, take a location parameter for the
	qualifier.
	(declspecs_add_type): Likewise, take a location parameter for the
	type specifier.
	(declspecs_add_scspec): Likewise, take a location parameter for
	the storage class specifier.
	(declspecs_add_attrs): Likewise, take a location parameter for the
	first attribute.
	(declspecs_add_alignas): Likewise, take a location parameter for
	the alignas token.
	(finish_declspecs): For diagnostics, use the location of the
	relevant declspec, instead of the global input_location.
	* c-parser.c (c_parser_parameter_declaration): Pass the precise
	virtual location of the declspec to the declspecs-setters.
	(c_parser_declspecs): Likewise.  Avoid calling c_parser_peek_token
	repeatedly.

gcc/cp/

	PR preprocessor/7263
	* cp-tree.h (enum cp_decl_spec): Add new enumerators to cover all
	the possible declarator specifiers so far.
	(struct cp_decl_specifier_seq::locations): Declare new member.
	(cp_decl_specifier_seq::{specs, type_location}): Remove.
	(decl_spec_seq_has_spec_p): Declare new function.
	* parser.c (cp_parser_check_decl_spec): Remove.
	(set_and_check_decl_spec_loc): Define new static function.
	(decl_spec_seq_has_spec_p): Define new public function.
	(cp_parser_decl_specifier_seq, cp_parser_function_specifier_opt)
	(cp_parser_type_specifier, cp_parser_simple_type_specifier)
	(cp_parser_set_storage_class, cp_parser_set_decl_spec_type)
	(cp_parser_alias_declaration): Set the locations for each
	declspec, using set_and_check_decl_spec_loc.
	(cp_parser_explicit_instantiation, cp_parser_init_declarator)
	(cp_parser_member_declaration, cp_parser_init_declarator): Use the
	new declspec location for specifiers.  Use the new
	decl_spec_seq_has_spec_p.
	(cp_parser_type_specifier_seq): Use the new
	set_and_check_decl_spec_loc.  Stop using
	cp_parser_check_decl_spec.  Use the new decl_spec_seq_has_spec_p.
	(, cp_parser_init_declarator): Use the new
	set_and_check_decl_spec_loc.
	(cp_parser_single_declaration, cp_parser_friend_p)
	(cp_parser_objc_class_ivars, cp_parser_objc_struct_declaration):
	Use the new decl_spec_seq_has_spec_p.
	* decl.c (check_tag_decl): Use new decl_spec_seq_has_spec_p.  Use
	the more precise ds_redefined_builtin_type_spec location for
	diagnostics about re-declaring C++ built-in types.
	(start_decl, grokvardecl, grokdeclarator): Use the new
	decl_spec_seq_has_spec_p.

gcc/testsuite/

	PR preprocessor/7263
	* gcc.dg/binary-constants-2.c: Run without tracking locations
	accross macro expansion.
	* gcc.dg/binary-constants-3.c: Likewise.
	* gcc.dg/cpp/sysmac2.c: Likewise.
	* testsuite/gcc.dg/nofixed-point-2.c: Adjust for more precise
	location.
	* gcc.dg/cpp/syshdr3.c: New test.
	* gcc.dg/cpp/syshdr3.h: New header for the new test above.
	* gcc.dg/system-binary-constants-1.c: New test.
	* gcc.dg/system-binary-constants-1.h: New header for the new test
	above.
	* g++.dg/cpp/syshdr3.C: New test.
	* g++.dg/cpp/syshdr3.h: New header the new test above.
	* g++.dg/system-binary-constants-1.C: New test.
	* g++.dg/system-binary-constants-1.h: New header the new test
	above.
---
 gcc/c-decl.c                                     |  127 +++++++++---
 gcc/c-family/c-lex.c                             |    4 +-
 gcc/c-parser.c                                   |   22 +-
 gcc/c-tree.h                                     |   54 ++++-
 gcc/cp/cp-tree.h                                 |   21 ++-
 gcc/cp/decl.c                                    |   80 ++++----
 gcc/cp/decl2.c                                   |    2 +-
 gcc/cp/parser.c                                  |  255 +++++++++++++---------
 gcc/testsuite/g++.dg/cpp/syshdr3.C               |   16 ++
 gcc/testsuite/g++.dg/cpp/syshdr3.h               |    7 +
 gcc/testsuite/g++.dg/system-binary-constants-1.C |   18 ++
 gcc/testsuite/g++.dg/system-binary-constants-1.h |    3 +
 gcc/testsuite/gcc.dg/binary-constants-2.c        |    2 +-
 gcc/testsuite/gcc.dg/binary-constants-3.c        |    2 +-
 gcc/testsuite/gcc.dg/cpp/pr7263-3.c              |    2 +-
 gcc/testsuite/gcc.dg/cpp/syshdr3.c               |   16 ++
 gcc/testsuite/gcc.dg/cpp/syshdr3.h               |    7 +
 gcc/testsuite/gcc.dg/cpp/sysmac1.c               |    2 +-
 gcc/testsuite/gcc.dg/cpp/sysmac2.c               |    2 +-
 gcc/testsuite/gcc.dg/nofixed-point-2.c           |    6 +-
 gcc/testsuite/gcc.dg/system-binary-constants-1.c |   18 ++
 gcc/testsuite/gcc.dg/system-binary-constants-1.h |    3 +
 libcpp/expr.c                                    |  182 +++++++++-------
 libcpp/include/cpplib.h                          |    2 +-
 24 files changed, 573 insertions(+), 280 deletions(-)
 create mode 100644 gcc/testsuite/g++.dg/cpp/syshdr3.C
 create mode 100644 gcc/testsuite/g++.dg/cpp/syshdr3.h
 create mode 100644 gcc/testsuite/g++.dg/system-binary-constants-1.C
 create mode 100644 gcc/testsuite/g++.dg/system-binary-constants-1.h
 create mode 100644 gcc/testsuite/gcc.dg/cpp/syshdr3.c
 create mode 100644 gcc/testsuite/gcc.dg/cpp/syshdr3.h
 create mode 100644 gcc/testsuite/gcc.dg/system-binary-constants-1.c
 create mode 100644 gcc/testsuite/gcc.dg/system-binary-constants-1.h

PR preprocessor/7263 - Avoid pedantic warnings on system headers macro tokens

Commit Message

Comments

Patch