Skip to content
Snippets Groups Projects
  • Lewis Hyatt's avatar
    4f3be7cb
    libcpp: Improve location for macro names [PR66290] · 4f3be7cb
    Lewis Hyatt authored
    When libcpp reports diagnostics whose locus is a macro name (such as for
    -Wunused-macros), it uses the location in the cpp_macro object that was
    stored by _cpp_new_macro. This is currently set to pfile->directive_line,
    which contains the line number only and no column information. This patch
    changes the stored location to the src_loc for the token defining the macro
    name, which includes the location and range information.
    
    libcpp/ChangeLog:
    
    	PR c++/66290
    	* macro.cc (_cpp_create_definition): Add location argument.
    	* internal.h (_cpp_create_definition): Adjust prototype.
    	* directives.cc (do_define): Pass new location argument to
    	_cpp_create_definition.
    	(do_undef): Stop passing inferior location to cpp_warning_with_line;
    	the default from cpp_warning is better.
    	(cpp_pop_definition): Pass new location argument to
    	_cpp_create_definition.
    	* pch.cc (cpp_read_state): Likewise.
    
    gcc/testsuite/ChangeLog:
    
    	PR c++/66290
    	* c-c++-common/cpp/macro-ranges.c: New test.
    	* c-c++-common/cpp/line-2.c: Adapt to check for column information
    	on macro-related libcpp warnings.
    	* c-c++-common/cpp/line-3.c: Likewise.
    	* c-c++-common/cpp/macro-arg-count-1.c: Likewise.
    	* c-c++-common/cpp/pr58844-1.c: Likewise.
    	* c-c++-common/cpp/pr58844-2.c: Likewise.
    	* c-c++-common/cpp/warning-zero-location.c: Likewise.
    	* c-c++-common/pragma-diag-14.c: Likewise.
    	* c-c++-common/pragma-diag-15.c: Likewise.
    	* g++.dg/modules/macro-2_d.C: Likewise.
    	* g++.dg/modules/macro-4_d.C: Likewise.
    	* g++.dg/modules/macro-4_e.C: Likewise.
    	* g++.dg/spellcheck-macro-ordering.C: Likewise.
    	* gcc.dg/builtin-redefine.c: Likewise.
    	* gcc.dg/cpp/Wunused.c: Likewise.
    	* gcc.dg/cpp/redef2.c: Likewise.
    	* gcc.dg/cpp/redef3.c: Likewise.
    	* gcc.dg/cpp/redef4.c: Likewise.
    	* gcc.dg/cpp/ucnid-11-utf8.c: Likewise.
    	* gcc.dg/cpp/ucnid-11.c: Likewise.
    	* gcc.dg/cpp/undef2.c: Likewise.
    	* gcc.dg/cpp/warn-redefined-2.c: Likewise.
    	* gcc.dg/cpp/warn-redefined.c: Likewise.
    	* gcc.dg/cpp/warn-unused-macros-2.c: Likewise.
    	* gcc.dg/cpp/warn-unused-macros.c: Likewise.
    4f3be7cb
    History
    libcpp: Improve location for macro names [PR66290]
    Lewis Hyatt authored
    When libcpp reports diagnostics whose locus is a macro name (such as for
    -Wunused-macros), it uses the location in the cpp_macro object that was
    stored by _cpp_new_macro. This is currently set to pfile->directive_line,
    which contains the line number only and no column information. This patch
    changes the stored location to the src_loc for the token defining the macro
    name, which includes the location and range information.
    
    libcpp/ChangeLog:
    
    	PR c++/66290
    	* macro.cc (_cpp_create_definition): Add location argument.
    	* internal.h (_cpp_create_definition): Adjust prototype.
    	* directives.cc (do_define): Pass new location argument to
    	_cpp_create_definition.
    	(do_undef): Stop passing inferior location to cpp_warning_with_line;
    	the default from cpp_warning is better.
    	(cpp_pop_definition): Pass new location argument to
    	_cpp_create_definition.
    	* pch.cc (cpp_read_state): Likewise.
    
    gcc/testsuite/ChangeLog:
    
    	PR c++/66290
    	* c-c++-common/cpp/macro-ranges.c: New test.
    	* c-c++-common/cpp/line-2.c: Adapt to check for column information
    	on macro-related libcpp warnings.
    	* c-c++-common/cpp/line-3.c: Likewise.
    	* c-c++-common/cpp/macro-arg-count-1.c: Likewise.
    	* c-c++-common/cpp/pr58844-1.c: Likewise.
    	* c-c++-common/cpp/pr58844-2.c: Likewise.
    	* c-c++-common/cpp/warning-zero-location.c: Likewise.
    	* c-c++-common/pragma-diag-14.c: Likewise.
    	* c-c++-common/pragma-diag-15.c: Likewise.
    	* g++.dg/modules/macro-2_d.C: Likewise.
    	* g++.dg/modules/macro-4_d.C: Likewise.
    	* g++.dg/modules/macro-4_e.C: Likewise.
    	* g++.dg/spellcheck-macro-ordering.C: Likewise.
    	* gcc.dg/builtin-redefine.c: Likewise.
    	* gcc.dg/cpp/Wunused.c: Likewise.
    	* gcc.dg/cpp/redef2.c: Likewise.
    	* gcc.dg/cpp/redef3.c: Likewise.
    	* gcc.dg/cpp/redef4.c: Likewise.
    	* gcc.dg/cpp/ucnid-11-utf8.c: Likewise.
    	* gcc.dg/cpp/ucnid-11.c: Likewise.
    	* gcc.dg/cpp/undef2.c: Likewise.
    	* gcc.dg/cpp/warn-redefined-2.c: Likewise.
    	* gcc.dg/cpp/warn-redefined.c: Likewise.
    	* gcc.dg/cpp/warn-unused-macros-2.c: Likewise.
    	* gcc.dg/cpp/warn-unused-macros.c: Likewise.