diff options
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/c-family/c-pch.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index afe19730cf1..22363543afb 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2011-08-22 Dodji Seketeli <dodji@redhat.com> + + * c-family/c-pch.c (c_common_read_pch): Re-set line table right + after reading in the pch. + 2011-08-22 H.J. Lu <hongjiu.lu@intel.com> * acinclude.m4 (gcc_AC_INITFINI_ARRAY): Error if __ELF__ isn't diff --git a/gcc/c-family/c-pch.c b/gcc/c-family/c-pch.c index b429d9d7713..3c2fd18f063 100644 --- a/gcc/c-family/c-pch.c +++ b/gcc/c-family/c-pch.c @@ -431,6 +431,7 @@ c_common_read_pch (cpp_reader *pfile, const char *name, timevar_pop (TV_PCH_CPP_RESTORE); gt_pch_restore (f); + cpp_set_line_map (pfile, line_table); timevar_push (TV_PCH_CPP_RESTORE); if (cpp_read_state (pfile, name, f, smd) != 0) @@ -445,7 +446,6 @@ c_common_read_pch (cpp_reader *pfile, const char *name, fclose (f); line_table->trace_includes = saved_trace_includes; - cpp_set_line_map (pfile, line_table); linemap_add (line_table, LC_RENAME, 0, saved_loc.file, saved_loc.line); /* Give the front end a chance to take action after a PCH file has |