aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorDehao Chen <dehao@google.com>2012-09-25 13:19:33 +0000
committerDehao Chen <dehao@gcc.gnu.org>2012-09-25 13:19:33 +0000
commit521870087489ac8cdd3aa6c660b641c9285848d5 (patch)
tree15300d39cad0dd42a53b5a881a84a683ae95f406 /gcc
parentc1301f602711e6397326084efef1516a194c9e84 (diff)
downloadgcc-521870087489ac8cdd3aa6c660b641c9285848d5.zip
gcc-521870087489ac8cdd3aa6c660b641c9285848d5.tar.gz
gcc-521870087489ac8cdd3aa6c660b641c9285848d5.tar.bz2
re PR middle-end/54645 (Many testsuite failures)
gcc: 2012-09-25 Dehao Chen <dehao@google.com> PR middle-end/54645 * c-family/c-pch.c (c_common_read_pch): Rebuild the location_adhoc_data map when read in the pch. libcpp: 2012-09-25 Dehao Chen <dehao@google.com> PR middle-end/54645 * include/line-map.h (location_adhoc_data): Move location_adhoc_data into GC. (location_adhoc_data_map): Likewise. (line_maps): Likewise. (rebuild_location_adhoc_htab): New Function. * line-map.c (+rebuild_location_adhoc_htab): new Funcion. (get_combined_adhoc_loc): Move location_adhoc_data into GC. (location_adhoc_data_fini): Likewise. (linemap_init): Likewise. (location_adhoc_data_init): Remove Function. From-SVN: r191706
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/c-family/c-pch.c1
2 files changed, 7 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index df7ab16..61134bd 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2012-09-25 Dehao Chen <dehao@google.com>
+
+ PR middle-end/54645
+ * c-family/c-pch.c (c_common_read_pch): Rebuild the location_adhoc_data
+ map when read in the pch.
+
2012-09-25 Jakub Jelinek <jakub@redhat.com>
PR tree-optimization/54676
diff --git a/gcc/c-family/c-pch.c b/gcc/c-family/c-pch.c
index 3a588f0..b239ed4 100644
--- a/gcc/c-family/c-pch.c
+++ b/gcc/c-family/c-pch.c
@@ -340,6 +340,7 @@ c_common_read_pch (cpp_reader *pfile, const char *name,
gt_pch_restore (f);
cpp_set_line_map (pfile, line_table);
+ rebuild_location_adhoc_htab (line_table);
timevar_push (TV_PCH_CPP_RESTORE);
if (cpp_read_state (pfile, name, f, smd) != 0)