git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid dangling line table after loading pch 

gcc/

	* c-family/c-pch.c (c_common_read_pch): Re-set line table right
	after reading in the pch.

From-SVN: r177964
This commit is contained in:
Dodji Seketeli 2011-08-22 16:00:32 +00:00 committed by Dodji Seketeli
parent b0894e1f4f
commit 671d9f12cf
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/ChangeLog
View File

@ -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

2
gcc/c-family/c-pch.c
View File

@ -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