re PR fortran/54599 (Issues found in gfortran by the Coverity Scan)

2012-09-20  Tobias Burnus  <burnus@net-b.de>

        PR fortran/54599
        * cpp.c (print_line): Properly handle extern C.

From-SVN: r191590

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 2f405b86bf0d5b61b6f8fdfc7dc4155f56133d0d..6679a15ae20f23e53506370ff64c648f8889a8e9 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2012-09-20  Tobias Burnus  <burnus@net-b.de>
+
+       PR fortran/54599
+       * cpp.c (print_line): Properly handle extern C.
+
 2012-09-20  Martin Jambor  <mjambor@suse.cz>
 
        * trans-decl.c (gfc_get_extern_function_decl): Push NULL cfun.  Do not

diff --git a/gcc/fortran/cpp.c b/gcc/fortran/cpp.c
index 2f18893313ba659d271856d5225d982471621907..c45af39ef61aa4a6374b98b7aafcf77f4cc64a39 100644 (file)
--- a/gcc/fortran/cpp.c
+++ b/gcc/fortran/cpp.c
@@ -822,6 +822,7 @@ print_line (source_location src_loc, const char *special_flags)
       size_t to_file_len;
       unsigned char *to_file_quoted;
       unsigned char *p;
+      int sysp;
 
       loc = expand_location (src_loc);
       to_file_len = strlen (loc.file);
@@ -838,9 +839,10 @@ print_line (source_location src_loc, const char *special_flags)
               print.src_line == 0 ? 1 : print.src_line,
               to_file_quoted, special_flags);
 
-      if (loc.sysp == 2)
+      sysp = in_system_header_at (src_loc);
+      if (sysp == 2)
        fputs (" 3 4", print.outf);
-      else if (loc.sysp == 1)
+      else if (sysp == 1)
        fputs (" 3", print.outf);
 
       putc ('\n', print.outf);