[PATCH] line-map include-from representation

[thirdparty/gcc.git] / gcc / c-family / c-ppoutput.c

diff --git a/gcc/c-family/c-ppoutput.c b/gcc/c-family/c-ppoutput.c
index 8c525caf28daa9e66652a8d9f6e38fe707210583..b8fc1c6dad931c1f53dee78082a3034a0e241085 100644 (file)
--- a/gcc/c-family/c-ppoutput.c
+++ b/gcc/c-family/c-ppoutput.c
@@ -663,11 +663,9 @@ pp_file_change (const line_map_ordinary *map)
          /* Bring current file to correct line when entering a new file.  */
          if (map->reason == LC_ENTER)
            {
-             const line_map_ordinary *from = INCLUDED_FROM (line_table, map);
-             maybe_print_line (LAST_SOURCE_LINE_LOCATION (from));
+             maybe_print_line (linemap_included_from (map));
+             flags = " 1";
            }
-         if (map->reason == LC_ENTER)
-           flags = " 1";
          else if (map->reason == LC_LEAVE)
            flags = " 2";
          print_line (map->start_location, flags);