Hi Tobias,
Am 23.09.21 um 00:06 schrieb Tobias Burnus:
Hi Harald,
On 22.09.21 20:29, Harald Anlauf via Gcc-patches wrote:
What I find a bit confusing - from the viewpoint of a user - is the
case of using the preprocessor (-cpp), as one gets e.g.
<built-in>: Warning: ./no/such/dir: No such file or directory
[-Wmissing-include-dirs]
while without -cpp:
f951: Warning: Nonexistent include directory './no/such/dir/'
[-Wmissing-include-dirs]
C/C++ do something likewise (grep for that string).
The reason for the <built-in> is the code in cpp.c's gfc_cpp_init,
which uses:
cpp_change_file (cpp_in, LC_RENAME, _("<built-in>"));
It might be possible to reset it by passing NULL to it, at the end
of that function but I don't know whether that causes side effects.
At least linemap_add then uses set->depth--.
It might work just fine, but I do not know.
(Additionally, cb_file_change or print_line needs to be updated
to handle to_file == NULL.)
Feel free to experiment there. Otherwise, I leave it as is.
I did experiment a little, trying to get something like <cpp>.
Unfortunately this lead nowhere, and while I consider this
something nice-to-have, it is not important.
* * *
However, this patch now improves the diagnostic printed by
load_file – and uses directly an fatal error instead of
a usual error and then propagating the error through.
Errors are now also properly colored.
Note:
* -fpre-included= is not easily testable. It works when calling
the compiler itself (f951) but the driver (gfortran) overrides
it here with:
-fpre-include=/usr/include/finclude/math-vector-fortran.h
which exits.
* I did not include the test "include_22.f90" with:
include "include_22.f90" ! { dg-error "File 'include_22.f90' is
being included recursively" }
as the error message seemingly confused DejaGNU and causes it
to enter an endless loop.
OK for mainline?
LGTM.
Another argument for your patch series: try -fpre-include=/
* * *
There is one older issue with line numbers being off-by-one.
E.g. the testcase:
program p
implicit none
#include "no/such/file.inc"
type t
end type t
end
compiled with -cpp gives:
pr55534-play.f90:4:2:
4 | type t
| 1~~~~~~
Fatal Error: no/such/file.inc: No such file or directory
compilation terminated.
If you have an easy solution for that one, it is pre-approved.
Thanks for the patch!
Harald
Tobias
-----------------
Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstraße 201,
80634 München; Gesellschaft mit beschränkter Haftung; Geschäftsführer:
Thomas Heurung, Frank Thürauf; Sitz der Gesellschaft: München;
Registergericht München, HRB 106955
